Commit bef632e8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq

parents b658489f 78b3fb76
...@@ -151,7 +151,7 @@ stop() { ...@@ -151,7 +151,7 @@ stop() {
exit_if_not_running exit_if_not_running
# If the Unicorn web server is running, tell it to stop; # If the Unicorn web server is running, tell it to stop;
if [ "$web_status" = "0" ]; then if [ "$web_status" = "0" ]; then
kill -QUIT "$wpid" & kill -QUIT "$wpid"
echo "Stopping the GitLab Unicorn web server..." echo "Stopping the GitLab Unicorn web server..."
stopping=true stopping=true
else else
...@@ -160,7 +160,7 @@ stop() { ...@@ -160,7 +160,7 @@ stop() {
# And do the same thing for the Sidekiq. # And do the same thing for the Sidekiq.
if [ "$sidekiq_status" = "0" ]; then if [ "$sidekiq_status" = "0" ]; then
printf "Stopping Sidekiq job dispatcher." 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 stopping=true
else else
echo "The Sidekiq was not running, must have run out of breath." echo "The Sidekiq was not running, must have run out of breath."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment