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

scripts: Only stop/start existing tornado processes. 

Stopping both `zulip-tornado` and `zulip-tornado:*` causes errors on
deploys with tornado sharding, as the plain `zulip-tornado` service
does not exist.

Pass `zulip-tornado:*`, which matches both plain `zulip-tornado`, as
well as the sharded `zulip-tornado:zulip-tornado-port-9800` cases.
This commit is contained in:
Alex Vandiver 2021-12-08 10:22:30 -08:00 committed by Tim Abbott
parent 091772b534
commit 939d2e2705
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/restart-server
View File

@ -137,7 +137,7 @@ if has_application_server():
) )
else: else:
logging.info("%s Tornado process", verbing) logging.info("%s Tornado process", verbing)
subprocess.check_call(["supervisorctl", action, "zulip-tornado", "zulip-tornado:*"]) subprocess.check_call(["supervisorctl", action, "zulip-tornado:*"])
# Finally, restart the Django uWSGI processes. # Finally, restart the Django uWSGI processes.
logging.info("%s django server", verbing) logging.info("%s django server", verbing)

2
scripts/stop-server
View File

@ -39,7 +39,7 @@ if has_application_server():
# closer to "empty." We stop Django before Tornado so it doesn't try # closer to "empty." We stop Django before Tornado so it doesn't try
# to make requests to make queues with a down'd Tornado. # to make requests to make queues with a down'd Tornado.
services.append("zulip-django") services.append("zulip-django")
services.extend(["zulip-tornado", "zulip-tornado:*"]) services.append("zulip-tornado:*")
services.append("zulip-workers:*") services.append("zulip-workers:*")
if has_application_server(once=True): if has_application_server(once=True):
# These used to be included in "zulip-workers:*"; since we may # These used to be included in "zulip-workers:*"; since we may