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'.

Be more selective when killing stray Sidekiqs
8e2752f4 · Jacob Vosmaer · 11e1c013 · 8e2752f4 · 8e2752f4
Commit 8e2752f4 authored Jun 12, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

background_jobs bin/background_jobs +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 7.0.0
  - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
  - Overall performance improvements
  - Skip init script check on omnibus-gitlab
+  - Be more selective when killing stray Sidekiqs

 v 6.9.2
  - Revert the commit that broke the LDAP user filter

--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -18,7 +18,7 @@ function stop

 function killall
 {
-  pkill -u $gitlab_user -f sidekiq
+  pkill -u $gitlab_user -f 'sidekiq [0-9]'
 }

 function restart