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

scripts: Fix path to additional Zulip supervisor files. 

The path which contains all of the Zulip supervisor files changed in
3ab9b31d2f to make it easier to purge
now-unwanted supervisor configuration files.  However, the paths that
the zulip upgrade process, and restart-server, look at were not
adjusted.

Fix the supervisor configuration file paths.
This commit is contained in:
Alex Vandiver 2021-04-20 01:09:42 +00:00 committed by Tim Abbott
parent bbbaa109ec
commit 0de8357820
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/upgrade-zulip-stage-2
View File

@ -107,7 +107,7 @@ def shutdown_server() -> None:
] ]
worker_services = ["zulip-workers:*"] worker_services = ["zulip-workers:*"]
# Stop and start thumbor service only if thumbor is installed. # Stop and start thumbor service only if thumbor is installed.
if os.path.exists("/etc/supervisor/conf.d/thumbor.conf"): if os.path.exists("/etc/supervisor/conf.d/zulip/thumbor.conf"):
core_server_services.append("zulip-thumbor") core_server_services.append("zulip-thumbor")
logging.info("Stopping Zulip...") logging.info("Stopping Zulip...")
@ -275,7 +275,7 @@ if not args.skip_migrations:
# Now we start shutting down services; we start with # Now we start shutting down services; we start with
# process-fts-updates, which isn't on the critical serving path. # process-fts-updates, which isn't on the critical serving path.
if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"): if os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf"):
subprocess.check_call(["supervisorctl", "stop", "process-fts-updates"], preexec_fn=su_to_zulip) subprocess.check_call(["supervisorctl", "stop", "process-fts-updates"], preexec_fn=su_to_zulip)
if (not args.skip_puppet or migrations_needed) and IS_SERVER_UP: if (not args.skip_puppet or migrations_needed) and IS_SERVER_UP:

4
scripts/restart-server
View File

@ -43,7 +43,7 @@ if args.fill_cache:
subprocess.check_call(["./manage.py", "fill_memcached_caches"]) subprocess.check_call(["./manage.py", "fill_memcached_caches"])
core_server_services = ["zulip-django"] core_server_services = ["zulip-django"]
if os.path.exists("/etc/supervisor/conf.d/thumbor.conf"): if os.path.exists("/etc/supervisor/conf.d/zulip/thumbor.conf"):
core_server_services.append("zulip-thumbor") core_server_services.append("zulip-thumbor")
current_symlink = os.path.join(DEPLOYMENTS_DIR, "current") current_symlink = os.path.join(DEPLOYMENTS_DIR, "current")
@ -89,7 +89,7 @@ if using_sso.strip() == b"True":
logging.info("Restarting Apache WSGI process...") logging.info("Restarting Apache WSGI process...")
subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"]) subprocess.check_call(["pkill", "-f", "apache2", "-u", "zulip"])
if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"): if os.path.exists("/etc/supervisor/conf.d/zulip/zulip_db.conf"):
subprocess.check_call(["supervisorctl", "restart", "process-fts-updates"]) subprocess.check_call(["supervisorctl", "restart", "process-fts-updates"])
logging.info("Done!") logging.info("Done!")