From 91750aa8a86423e3943ec19264c652e91eefeffe Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 25 Sep 2013 14:11:33 -0400 Subject: [PATCH] [manual] Write logs to /var/log/zulip rather than /var/log/humbug. This requires a puppet apply to update the supervisor configuration. (imported from commit f2836b6d9c53791af6f6ceb1650d0e0740df70ab) --- bots/feedback-bot | 2 +- bots/zmirror_private.conf.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/feedback-bot b/bots/feedback-bot index 9e2a4c7..9d91df0 100755 --- a/bots/feedback-bot +++ b/bots/feedback-bot @@ -22,7 +22,7 @@ class StreamLogger(object): self.logger.log(self.log_level, self.buffer.rstrip()) self.buffer = "" -logging.basicConfig(filename="/var/log/humbug/feedback-bot.log", +logging.basicConfig(filename="/var/log/zulip/feedback-bot.log", level=logging.DEBUG, format="%(asctime)s %(levelname)s\t%(message)s") # The API prints to stdout, so capture and format those messages as well. diff --git a/bots/zmirror_private.conf.template b/bots/zmirror_private.conf.template index 2adcf2b..4a08aaf 100644 --- a/bots/zmirror_private.conf.template +++ b/bots/zmirror_private.conf.template @@ -7,5 +7,5 @@ stopsignal=TERM ; signal used to kill process (default TERM) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) user=humbug ; setuid to this UNIX account to run the program redirect_stderr=true ; redirect proc stderr to stdout (default false) -stdout_logfile=/var/log/humbug/%(program_name)s.log ; stdout log path, NONE for none; default AUTO +stdout_logfile=/var/log/zulip/%(program_name)s.log ; stdout log path, NONE for none; default AUTO environment=HOME="/home/humbug",USER="humbug",KRB5CCNAME="/home/humbug/ccache/%(program_name)s"