summaryrefslogtreecommitdiff
path: root/bin/background_jobs
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-12 10:42:38 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-12 15:32:47 +0200
commit8e2752f4595db07197cacbf8c352e51b5268b71b (patch)
tree3b933cbadafc99ad75c4791ed7d1d1989f351dae /bin/background_jobs
parent11e1c0134195270eabd2774055713699450ba49d (diff)
downloadgitlab-ce-8e2752f4595db07197cacbf8c352e51b5268b71b.tar.gz
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'.
Diffstat (limited to 'bin/background_jobs')
-rwxr-xr-xbin/background_jobs2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/background_jobs b/bin/background_jobs
index e0140e9689b..c7ba4398cfb 100755
--- 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