Download as
Browse Code »

Commit cf7aab9b441f61a0db11f1f20887db1862c8c791

Authored by Dmitriy Zaporozhets
2 parents aabd90a8 24e9c5e8
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
lib/support/init.d/gitlab
  Diff comments   View file @cf7aab9
... ... @@ -131,7 +131,7 @@ check_stale_pids(){
131 131 fi
132 132 fi
133 133 if [ "$spid" != "0" -a "$sidekiq_status" != "0" ]; then
134   - echo "Removing stale Sidekiq web server pid. This is most likely caused by the Sidekiq crashing the last time it ran."
  134 + echo "Removing stale Sidekiq job dispatcher pid. This is most likely caused by Sidekiq crashing the last time it ran."
135 135 if ! rm "$sidekiq_pid_path"; then
136 136 echo "Unable to remove stale pid, exiting"
137 137 exit 1
... ... @@ -155,9 +155,9 @@ start_gitlab() {
155 155 if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
156 156 echo -n "Starting both the GitLab Unicorn and Sidekiq"
157 157 elif [ "$web_status" != "0" ]; then
158   - echo -n "Starting GitLab Sidekiq"
159   - elif [ "$sidekiq_status" != "0" ]; then
160 158 echo -n "Starting GitLab Unicorn"
  159 + elif [ "$sidekiq_status" != "0" ]; then
  160 + echo -n "Starting GitLab Sidekiq"
161 161 fi
162 162  
163 163 # Then check if the service is running. If it is: don't start again.
... ... @@ -190,9 +190,9 @@ stop_gitlab() {
190 190 if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
191 191 echo -n "Shutting down both Unicorn and Sidekiq"
192 192 elif [ "$web_status" = "0" ]; then
193   - echo -n "Shutting down Sidekiq"
194   - elif [ "$sidekiq_status" = "0" ]; then
195 193 echo -n "Shutting down Unicorn"
  194 + elif [ "$sidekiq_status" = "0" ]; then
  195 + echo -n "Shutting down Sidekiq"
196 196 fi
197 197  
198 198 # If the Unicorn web server is running, tell it to stop;
... ...