paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace python -u with PYTHONUNBUFFERED=1

Browse Source 
(Why is -u needed at all?  I’m not sure, but test-run-dev spins forever
“Polling run-dev...” without it.)

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2016-11-21 19:23:47 -05:00
committed by Tim Abbott
parent 573ec14955
commit 1ea8abe493
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ socket_owner=zulip:zulip
socket_mode=0700 socket_mode=0700
[program:zulip-tornado] [program:zulip-tornado]
command=python -u /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9993 command=env PYTHONUNBUFFERED=1 python /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9993
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)

2
tools/run-dev.py
View File

@@ -125,7 +125,7 @@ os.setpgrp()
cmds = [['./tools/compile-handlebars-templates', 'forever'], cmds = [['./tools/compile-handlebars-templates', 'forever'],
['python', 'manage.py', 'rundjango'] + ['python', 'manage.py', 'rundjango'] +
manage_args + ['127.0.0.1:%d' % (django_port,)], manage_args + ['127.0.0.1:%d' % (django_port,)],
['python', '-u', 'manage.py', 'runtornado'] + ['env', 'PYTHONUNBUFFERED=1', 'python', 'manage.py', 'runtornado'] +
manage_args + ['127.0.0.1:%d' % (tornado_port,)], manage_args + ['127.0.0.1:%d' % (tornado_port,)],
['./tools/run-dev-queue-processors'] + manage_args, ['./tools/run-dev-queue-processors'] + manage_args,
['env', 'PGHOST=127.0.0.1', # Force password authentication using .pgpass ['env', 'PGHOST=127.0.0.1', # Force password authentication using .pgpass