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

Revert "run-dev: Run process_queue with DJANGO_AUTORELOAD_ENV." 

This reverts commit 36a8e61e67 (#13934).

The Django 2.2 autoreloader works by forking into a child process that
exits with status 3 when a file changes, and a parent process that
restarts the child when it exits with status 3.  Setting this
environment variable had the effect of pretending we were already the
child process, without a parent process to restart it.  Therefore,
changing any code used by the queue processor caused it to exit rather
than restart.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2020-03-17 18:22:44 -07:00 committed by Tim Abbott
parent 7ff9b22500
commit a6624f04db
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/run-dev.py
View File

@ -10,7 +10,6 @@ import traceback
from urllib.parse import urlunparse
from django.utils.autoreload import DJANGO_AUTORELOAD_ENV
# check for the venv
from lib import sanity_check
sanity_check.check_venv(__file__)
@ -142,8 +141,7 @@ cmds = [['./manage.py', 'runserver'] +
manage_args + runserver_args + ['127.0.0.1:%d' % (django_port,)],
['env', 'PYTHONUNBUFFERED=1', './manage.py', 'runtornado'] +
manage_args + ['127.0.0.1:%d' % (tornado_port,)],
['env', '{}=true'.format(DJANGO_AUTORELOAD_ENV),
'./manage.py', 'process_queue', '--all'] + manage_args,
['./manage.py', 'process_queue', '--all'] + manage_args,
['env', 'PGHOST=127.0.0.1', # Force password authentication using .pgpass
'./puppet/zulip/files/postgresql/process_fts_updates'],
['./manage.py', 'deliver_scheduled_messages'],