Commit 234f4bf2 authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-gitlab-workhorse-initd-check' into 'master'

Check GitLab Workhorse status in init.d script when reporting all components are up and running

Closes https://github.com/gitlabhq/gitlabhq/issues/9869

See merge request !1969
parents e2c57a41 f1fd4880
......@@ -327,7 +327,7 @@ print_status() {
printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n"
fi
fi
if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ]; }; then
if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && [ "$gitlab_workhorse_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ]; }; then
printf "GitLab and all its components are \033[32mup and running\033[0m.\n"
fi
}
......
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