Skip to content
Snippets Groups Projects
Commit bf309fcf authored by Johannes Schleifenbaum's avatar Johannes Schleifenbaum Committed by Wes Gurney
Browse files

[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.
parent 685b6fd5
No related branches found
No related tags found
1 merge request!4954Add support to configure webhook_timeout in gitlab.yaml
This commit is part of merge request !4954. Comments created here will be created in the context of that merge request.
Loading
Loading
@@ -645,7 +645,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',
Loading
Loading
@@ -656,7 +655,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
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment