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
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'.
Jacob Vosmaer
1 parent 11e1c013
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
CHANGELOG
bin/background_jobs
@@ -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
@@ -18,7 +18,7 @@ function stop
  
 function killall
 {
-  pkill -u $gitlab_user -f sidekiq
+  pkill -u $gitlab_user -f 'sidekiq [0-9]'
 }
  
 function restart
...	...	@@ -32,6 +32,7 @@ v 7.0.0
32	32	- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
33	33	- Overall performance improvements
34	34	- Skip init script check on omnibus-gitlab
	35	+ - Be more selective when killing stray Sidekiqs
35	36
36	37	v 6.9.2
37	38	- Revert the commit that broke the LDAP user filter
...	...
...	...	@@ -18,7 +18,7 @@ function stop
18	18
19	19	function killall
20	20	{
21		- pkill -u $gitlab_user -f sidekiq
	21	+ pkill -u $gitlab_user -f 'sidekiq [0-9]'
22	22	}
23	23
24	24	function restart
...	...