Commit bef632e81652bb4704fe514458af561c055cea99
Exists in
master
and in
4 other branches
Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
lib/support/init.d/gitlab
| @@ -151,7 +151,7 @@ stop() { | @@ -151,7 +151,7 @@ stop() { | ||
| 151 | exit_if_not_running | 151 | exit_if_not_running |
| 152 | # If the Unicorn web server is running, tell it to stop; | 152 | # If the Unicorn web server is running, tell it to stop; |
| 153 | if [ "$web_status" = "0" ]; then | 153 | if [ "$web_status" = "0" ]; then |
| 154 | - kill -QUIT "$wpid" & | 154 | + kill -QUIT "$wpid" |
| 155 | echo "Stopping the GitLab Unicorn web server..." | 155 | echo "Stopping the GitLab Unicorn web server..." |
| 156 | stopping=true | 156 | stopping=true |
| 157 | else | 157 | else |
| @@ -160,7 +160,7 @@ stop() { | @@ -160,7 +160,7 @@ stop() { | ||
| 160 | # And do the same thing for the Sidekiq. | 160 | # And do the same thing for the Sidekiq. |
| 161 | if [ "$sidekiq_status" = "0" ]; then | 161 | if [ "$sidekiq_status" = "0" ]; then |
| 162 | printf "Stopping Sidekiq job dispatcher." | 162 | printf "Stopping Sidekiq job dispatcher." |
| 163 | - RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:stop & | 163 | + RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:stop |
| 164 | stopping=true | 164 | stopping=true |
| 165 | else | 165 | else |
| 166 | echo "The Sidekiq was not running, must have run out of breath." | 166 | echo "The Sidekiq was not running, must have run out of breath." |