From b5d7bcb7842d7a63de332e998d2c11ba3a5e1e6d Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 26 Sep 2013 15:40:44 +0200 Subject: [PATCH] [gitlab:check] Fix detecting the status of sidekiq If you are running another sidekiq instance on your server, e.g. GitLab CI, the check script would parse the output of `ps aux` searching for `sidekiq` and returning success, although the GitLab sidekiq may not be running. Now the `ps` call will only print the processes run by the GitLab user. --- lib/tasks/gitlab/check.rake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 88eb088c911..6e2a59f62ac 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -663,7 +663,6 @@ namespace :gitlab do else puts "#{sidekiq_match.length}".red try_fixing_it( - 'Unless you are running another Rails application on this server there should only be one Sidekiq process.', 'sudo service gitlab stop', 'sudo pkill -f sidekiq', 'sleep 10 && sudo pkill -9 -f sidekiq', @@ -674,7 +673,7 @@ namespace :gitlab do end def sidekiq_process_match - run_and_match("ps aux | grep -i sidekiq", /(sidekiq \d+\.\d+\.\d+.+$)/) + run_and_match("ps ux | grep -i sidekiq", /(sidekiq \d+\.\d+\.\d+.+$)/) end end