diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-07 12:45:20 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-07 12:45:20 +0000 |
| commit | bef632e81652bb4704fe514458af561c055cea99 (patch) | |
| tree | 1ed2861885d891d844e3b9d9195f6220a4c12f8e | |
| parent | b658489f27454a130b813cad95b0bd3f9bdac1c8 (diff) | |
| parent | 78b3fb769c9ad1c0283a344a572caa01f4389213 (diff) | |
| download | gitlab-ce-bef632e81652bb4704fe514458af561c055cea99.tar.gz | |
Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq
| -rwxr-xr-x | lib/support/init.d/gitlab | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 0248284f8d5..6aff7b5a8f9 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -151,7 +151,7 @@ stop() { exit_if_not_running # If the Unicorn web server is running, tell it to stop; if [ "$web_status" = "0" ]; then - kill -QUIT "$wpid" & + kill -QUIT "$wpid" echo "Stopping the GitLab Unicorn web server..." stopping=true else @@ -160,7 +160,7 @@ stop() { # And do the same thing for the Sidekiq. if [ "$sidekiq_status" = "0" ]; then printf "Stopping Sidekiq job dispatcher." - RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:stop & + RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:stop stopping=true else echo "The Sidekiq was not running, must have run out of breath." |