Commit ca1ba196 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Be more selective when killing stray Sidekiqs

Avoid the background_jobs script killing every process with 'sidekiq' in
its argument string (e.g. 'rake gitlab:sidekiq start') by also catching
the number (2) in 'sidekiq 2.14'.
parent 51f00817286b
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
- Overall performance improvements - Overall performance improvements
- Skip init script check on omnibus-gitlab - Skip init script check on omnibus-gitlab
- Be more selective when killing stray Sidekiqs
v 6.9.2 v 6.9.2
- Revert the commit that broke the LDAP user filter - Revert the commit that broke the LDAP user filter
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
function killall function killall
{ {
pkill -u $gitlab_user -f sidekiq pkill -u $gitlab_user -f 'sidekiq [0-9]'
} }
function restart function restart
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment