paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

restart-server: --tornado-reshard implies --skip-client-reloads.

Browse Source 
The flags are marked mutually exclusive, so don't pass both; have the
former imply the latter.
This commit is contained in:
Alex Vandiver
2025-10-15 01:44:23 +00:00
committed by Tim Abbott
parent b61b495112
commit 21f08265de
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/refresh-sharding-and-restart
View File

@@ -25,5 +25,5 @@ fi
# clients getting into reload loops ending in crashing on 500 response # clients getting into reload loops ending in crashing on 500 response
# while Django is restarting. For this reason it's important to # while Django is restarting. For this reason it's important to
# reload nginx only after Django and Tornado. # reload nginx only after Django and Tornado.
"$(dirname "$0")/restart-server" --skip-client-reloads --tornado-reshard "$(dirname "$0")/restart-server" --tornado-reshard
service nginx reload service nginx reload

7
scripts/restart-server
View File

@@ -303,7 +303,12 @@ if (action == "start" or args.less_graceful) and not args.only_django:
logging.info("Starting workers") logging.info("Starting workers")
subprocess.check_call(["supervisorctl", "start", *workers]) subprocess.check_call(["supervisorctl", "start", *workers])
if has_application_server() and not args.skip_client_reloads and not args.only_django: if (
has_application_server()
and not args.skip_client_reloads
and not args.only_django
and not args.tornado_reshard
):
# All of the servers have been (re)started; now enqueue events in # All of the servers have been (re)started; now enqueue events in
# the Tornado servers to tell clients to reload. # the Tornado servers to tell clients to reload.
logging.info("Sending reload events to clients in the background") logging.info("Sending reload events to clients in the background")