diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-08-23 10:28:07 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-08-23 10:31:32 +0200 |
| commit | 2b9d48ccd020a4ff62741118be94ab8d8f3b08b9 (patch) | |
| tree | 72dcd89cc58d5132455b4adfc3045b2f82ad88e0 /lib/support | |
| parent | 21e3d848b464f8cabbbddb3d2d4e2b697d4476b0 (diff) | |
| download | gitlab-ce-2b9d48ccd020a4ff62741118be94ab8d8f3b08b9.tar.gz | |
Fix the `service gitlab restart` command
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
worker processes.
Diffstat (limited to 'lib/support')
| -rw-r--r-- | lib/support/init.d/gitlab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 29c9d98965d..6f97643f9e0 100644 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -81,7 +81,7 @@ restart() { if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then echo "Restarting $DESC..." kill -USR2 `cat $WEB_SERVER_PID` - execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" + execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1" if [ `whoami` = root ]; then execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" fi |