From 6d38285a2eb6a2a1be6664751419521f917a22fb Mon Sep 17 00:00:00 2001 From: acrefoot Date: Wed, 13 Nov 2013 16:59:04 -0500 Subject: [PATCH] fixup supervisor oops related to postmaster config (imported from commit 8b5c39f0d13abb5e1def9f88a2ab82cfa67b42f6) --- puppet/zulip/files/supervisor/conf.d/zulip.conf | 2 +- puppet/zulip_internal/files/nagios3/conf.d/services.cfg | 4 ++-- zerver/management/commands/deliver_email.py | 2 +- zerver/management/commands/print_email_delivery_backlog.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/puppet/zulip/files/supervisor/conf.d/zulip.conf b/puppet/zulip/files/supervisor/conf.d/zulip.conf index e045e72b9e..89fdc2fc4f 100644 --- a/puppet/zulip/files/supervisor/conf.d/zulip.conf +++ b/puppet/zulip/files/supervisor/conf.d/zulip.conf @@ -197,7 +197,7 @@ stopsignal=TERM ; signal used to kill process (default TERM) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) user=zulip ; setuid to this UNIX account to run the program redirect_stderr=true ; redirect proc stderr to stdout (default false) -stdout_logfile=/var/log/zulip/events-digest_emails.log ; stdout log path, NONE for none; default AUTO +stdout_logfile=/var/log/zulip/events-deliver_enqueued_emails.log ; stdout log path, NONE for none; default AUTO directory=/home/zulip/deployments/current/ diff --git a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg index 3ee0cd0648..04a3d14507 100644 --- a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg +++ b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg @@ -333,14 +333,14 @@ define service { define service { use generic-service host staging - service_description Check email deliverer process (Currently only used on Zulip Enterprise) + service_description Check email deliverer process which is only used on Zulip Enterprise check_command check_email_deliverer_process contact_groups admins } define service { use generic-service - service_description Check email deliverer backlog (Currently only used on Zulip Enterprise) + service_description Check email deliverer backlog which is only used on Zulip Enterprise check_command check_email_deliverer_backlog hostgroup_name frontends contact_groups admins diff --git a/zerver/management/commands/deliver_email.py b/zerver/management/commands/deliver_email.py index 3bde578118..eec5b3cfe1 100755 --- a/zerver/management/commands/deliver_email.py +++ b/zerver/management/commands/deliver_email.py @@ -69,7 +69,7 @@ Run this command under supervisor. We use Mandrill for our deploy; this is for Z Usage: python manage.py deliver_email """ - def handle(self): + def handle(self, *args, **options): # TODO: this only acquires a lock on the system, not on the DB: # be careful not to run this on multiple systems. with lockfile("/tmp/zulip_email_deliver.lockfile"): diff --git a/zerver/management/commands/print_email_delivery_backlog.py b/zerver/management/commands/print_email_delivery_backlog.py index b1a3ecb91b..c46d1aab92 100755 --- a/zerver/management/commands/print_email_delivery_backlog.py +++ b/zerver/management/commands/print_email_delivery_backlog.py @@ -23,7 +23,7 @@ Please note that this is only currently useful for Zulip Enterprise deploys. Usage: python manage.py print_email_delivery_backlog """ - def handle(self): + def handle(self, *args, **options): print len(ScheduledJob.objects.filter(type=ScheduledJob.EMAIL, scheduled_timestamp__lte=datetime.utcnow()-timedelta(minutes=1))) return