summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-29 00:07:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-29 00:07:44 +0000
commite56fd471503e00167ca96e7792f75a0d1f3b7891 (patch)
tree87b8b69ea03c78beb5be85c5080c73f601ecc718 /bin
parent8831c2df7fa3f1bb567e284e4b8c0a4f441e74b3 (diff)
downloadgitlab-ce-e56fd471503e00167ca96e7792f75a0d1f3b7891.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-xbin/mail_room2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5b2b4..2539e3d388e 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()