kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

[gitlab:check] Fix detecting the status of sidekiq

Browse source 
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.
This commit is contained in:
Johannes Schleifenbaum 2013-09-26 15:40:44 +02:00
parent 72dd8011a7
commit b5d7bcb784
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/tasks/gitlab/check.rake
View file

@ -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