From 4017789f5aac8a8244e80c3f4feada5393c8a4ed Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 4 Oct 2013 11:18:44 +0200 Subject: [PATCH] Only kill sidekiqs belonging to gitlab user --- lib/tasks/gitlab/check.rake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 6e2a59f62..531b01c4d 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -289,7 +289,6 @@ namespace :gitlab do ######################## def check_gitlab_git_config - gitlab_user = Gitlab.config.gitlab.user print "Git configured for #{gitlab_user} user? ... " options = { @@ -664,8 +663,8 @@ namespace :gitlab do puts "#{sidekiq_match.length}".red try_fixing_it( 'sudo service gitlab stop', - 'sudo pkill -f sidekiq', - 'sleep 10 && sudo pkill -9 -f sidekiq', + "sudo pkill -u #{gitlab_user} -f sidekiq", + "sleep 10 && sudo pkill -9 -u #{gitlab_user} -f sidekiq", 'sudo service gitlab start' ) fix_and_rerun @@ -709,10 +708,13 @@ namespace :gitlab do end def sudo_gitlab(command) - gitlab_user = Gitlab.config.gitlab.user "sudo -u #{gitlab_user} -H #{command}" end + def gitlab_user + Gitlab.config.gitlab.user + end + def start_checking(component) puts "Checking #{component.yellow} ..." puts "" -- 2.11.0