From 939d2e27050ba5f43b77b7ef75b35fa2e8b83700 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Wed, 8 Dec 2021 10:22:30 -0800 Subject: [PATCH] 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. --- scripts/restart-server | 2 +- scripts/stop-server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restart-server b/scripts/restart-server index c319926fea..0ac13f8463 100755 --- a/scripts/restart-server +++ b/scripts/restart-server @@ -137,7 +137,7 @@ if has_application_server(): ) else: 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. logging.info("%s django server", verbing) diff --git a/scripts/stop-server b/scripts/stop-server index 6de4def2dc..03ca9a1640 100755 --- a/scripts/stop-server +++ b/scripts/stop-server @@ -39,7 +39,7 @@ if has_application_server(): # closer to "empty." We stop Django before Tornado so it doesn't try # to make requests to make queues with a down'd Tornado. services.append("zulip-django") - services.extend(["zulip-tornado", "zulip-tornado:*"]) + services.append("zulip-tornado:*") services.append("zulip-workers:*") if has_application_server(once=True): # These used to be included in "zulip-workers:*"; since we may