From 058aae5940762c18b3f099a6c3cb734041641390 Mon Sep 17 00:00:00 2001 From: Kyle Fazzari Date: Tue, 25 Feb 2014 19:10:35 -0500 Subject: Fixed Unicorn-Sidekiq confusion in GitLab init script. There were a few places in the included init script where Unicorn was referred to as Sidekiq and vice-versa. This fixes #126. --- lib/support/init.d/gitlab | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/support/init.d') diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index c6e570784e0..d6716cdecce 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -131,7 +131,7 @@ check_stale_pids(){ fi fi if [ "$spid" != "0" -a "$sidekiq_status" != "0" ]; then - echo "Removing stale Sidekiq web server pid. This is most likely caused by the Sidekiq crashing the last time it ran." + echo "Removing stale Sidekiq job dispatcher pid. This is most likely caused by Sidekiq crashing the last time it ran." if ! rm "$sidekiq_pid_path"; then echo "Unable to remove stale pid, exiting" exit 1 @@ -155,9 +155,9 @@ start() { if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then echo -n "Starting both the GitLab Unicorn and Sidekiq" elif [ "$web_status" != "0" ]; then - echo -n "Starting GitLab Sidekiq" - elif [ "$sidekiq_status" != "0" ]; then echo -n "Starting GitLab Unicorn" + elif [ "$sidekiq_status" != "0" ]; then + echo -n "Starting GitLab Sidekiq" fi # Then check if the service is running. If it is: don't start again. @@ -190,9 +190,9 @@ stop() { if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then echo -n "Shutting down both Unicorn and Sidekiq" elif [ "$web_status" = "0" ]; then - echo -n "Shutting down Sidekiq" - elif [ "$sidekiq_status" = "0" ]; then echo -n "Shutting down Unicorn" + elif [ "$sidekiq_status" = "0" ]; then + echo -n "Shutting down Sidekiq" fi # If the Unicorn web server is running, tell it to stop; -- cgit v1.2.1