From 12f8583e37c76a74d01b1f9eea198327db362551 Mon Sep 17 00:00:00 2001
From: charlieablett <cablett@gitlab.com>
Date: Wed, 26 Feb 2020 14:51:17 +1300
Subject: [PATCH] Add --log-exit-as arg
Logs exit as JSON, then exits rather than simply crashing out
---
Gemfile.lock | 4 ++--
bin/mail_room | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 1538fd64e1505..38de70b41ef60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -388,7 +388,7 @@ GEM
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
gitlab-license (1.0.0)
- gitlab-mail_room (0.0.1)
+ gitlab-mail_room (0.0.2)
gitlab-markup (1.7.0)
gitlab-net-dns (0.9.1)
gitlab-puma (4.3.1.gitlab.2)
@@ -1235,7 +1235,7 @@ DEPENDENCIES
gitlab-chronic (~> 0.10.5)
gitlab-labkit (= 0.10.0)
gitlab-license (~> 1.0)
- gitlab-mail_room (~> 0.0.1)
+ gitlab-mail_room (~> 0.0.2)
gitlab-markup (~> 1.7.0)
gitlab-net-dns (~> 0.9.1)
gitlab-puma (~> 4.3.1.gitlab.2)
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5b2b477..2539e3d388e3d 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -19,7 +19,7 @@ get_mail_room_pid()
start()
{
- bin/daemon_with_pidfile $mail_room_pidfile bundle exec mail_room -q -c $mail_room_config >> $mail_room_logfile 2>&1
+ bin/daemon_with_pidfile $mail_room_pidfile bundle exec mail_room --log-exit-as json -q -c $mail_room_config >> $mail_room_logfile 2>&1
}
stop()
--
GitLab