diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 14:09:37 -0700 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 14:09:37 -0700 |
commit | 41ed60c21a34f5a413c45d2d303e28b438a09ef2 (patch) | |
tree | b8508c82a8c5b19eb4a36efa4094a1a5920c355e | |
parent | 02b7be4a6847c0f79c6088edcc84600008ba0c1e (diff) | |
download | gitlab-ce-41ed60c21a34f5a413c45d2d303e28b438a09ef2.tar.gz |
Fix MailRoom running check.
-rw-r--r-- | lib/tasks/gitlab/check.rake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 608253d916c..3fbd429ef8d 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -645,7 +645,7 @@ namespace :gitlab do return end - if mail_room_process_count > 0 + if mail_room_running? puts "yes".green else puts "no".red @@ -716,9 +716,9 @@ namespace :gitlab do end end - def mail_room_process_count + def mail_room_running? ps_ux, _ = Gitlab::Popen.popen(%W(ps ux)) - ps_ux.scan(/mail_room \d+\.\d+\.\d+/).count + ps_ux.include?("mail_room") end end |