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

Dmitriy Zaporozhets
2 parents b658489f 78b3fb76
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
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."
...	...	@@ -151,7 +151,7 @@ stop() {
151	151	exit_if_not_running
152	152	# If the Unicorn web server is running, tell it to stop;
153	153	if [ "$web_status" = "0" ]; then
154		- kill -QUIT "$wpid" &
	154	+ kill -QUIT "$wpid"
155	155	echo "Stopping the GitLab Unicorn web server..."
156	156	stopping=true
157	157	else
...	...	@@ -160,7 +160,7 @@ stop() {
160	160	# And do the same thing for the Sidekiq.
161	161	if [ "$sidekiq_status" = "0" ]; then
162	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	164	stopping=true
165	165	else
166	166	echo "The Sidekiq was not running, must have run out of breath."
...	...