Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixup supervisor oops related to postmaster config 

(imported from commit 8b5c39f0d13abb5e1def9f88a2ab82cfa67b42f6)
This commit is contained in:
acrefoot 2013-11-13 16:59:04 -05:00
parent 1546d06344
commit 6d38285a2e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/files/supervisor/conf.d/zulip.conf
View File

@ -197,7 +197,7 @@ stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=zulip ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) 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/ directory=/home/zulip/deployments/current/

4
puppet/zulip_internal/files/nagios3/conf.d/services.cfg
View File

@ -333,14 +333,14 @@ define service {
define service { define service {
use generic-service use generic-service
host staging 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 check_command check_email_deliverer_process
contact_groups admins contact_groups admins
} }
define service { define service {
use generic-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 check_command check_email_deliverer_backlog
hostgroup_name frontends hostgroup_name frontends
contact_groups admins contact_groups admins

2
zerver/management/commands/deliver_email.py
View File

@ -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 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: # TODO: this only acquires a lock on the system, not on the DB:
# be careful not to run this on multiple systems. # be careful not to run this on multiple systems.
with lockfile("/tmp/zulip_email_deliver.lockfile"): with lockfile("/tmp/zulip_email_deliver.lockfile"):

2
zerver/management/commands/print_email_delivery_backlog.py
View File

@ -23,7 +23,7 @@ Please note that this is only currently useful for Zulip Enterprise deploys.
Usage: python manage.py print_email_delivery_backlog Usage: python manage.py print_email_delivery_backlog
""" """
def handle(self): def handle(self, *args, **options):
print len(ScheduledJob.objects.filter(type=ScheduledJob.EMAIL, print len(ScheduledJob.objects.filter(type=ScheduledJob.EMAIL,
scheduled_timestamp__lte=datetime.utcnow()-timedelta(minutes=1))) scheduled_timestamp__lte=datetime.utcnow()-timedelta(minutes=1)))
return return