diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-06 17:36:35 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-06 17:36:35 +0000 |
| commit | 234f4bf20fb338f2164976fd39203fbc671afd29 (patch) | |
| tree | 65b14dc8386fe3cc17386768c1ce02a2e29e4735 | |
| parent | e2c57a416d2090abea2db333ebb68ada630eb530 (diff) | |
| parent | f1fd4880d9bbb7c34e910b357bc52874d2e6188e (diff) | |
| download | gitlab-ce-234f4bf20fb338f2164976fd39203fbc671afd29.tar.gz | |
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
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index f0a6c2b30e9..43fda6fa92e 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -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 } |