Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
1 file
+ 1
2
Compare changes
  • Side-by-side
  • Inline
  • 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.
@@ -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',
@@ -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