From 51f069aa188733721b2ed822dd623c1002f3f4e8 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 4 Aug 2016 17:01:45 -0700 Subject: [PATCH] scripts: Refactor deployment-finished logging. --- scripts/deploy-zulip-from-git | 1 - scripts/lib/upgrade-zulip | 2 -- scripts/lib/upgrade-zulip-stage-2 | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/deploy-zulip-from-git b/scripts/deploy-zulip-from-git index c58e697bfb..99706049c3 100755 --- a/scripts/deploy-zulip-from-git +++ b/scripts/deploy-zulip-from-git @@ -80,7 +80,6 @@ try: subprocess.check_call(["sudo", os.path.join(deploy_path, "scripts", "lib", "upgrade-zulip-stage-2"), deploy_path, "--from-git"] + deploy_options) - logging.info("Deployment complete") subprocess.check_call(["./scripts/purge-old-deployments"]) finally: release_deployment_lock() diff --git a/scripts/lib/upgrade-zulip b/scripts/lib/upgrade-zulip index 16c748a6e9..3bb27403f5 100755 --- a/scripts/lib/upgrade-zulip +++ b/scripts/lib/upgrade-zulip @@ -51,7 +51,5 @@ try: deploy_path = deploy_path.strip() os.chdir(deploy_path) subprocess.check_call([os.path.abspath("./scripts/lib/upgrade-zulip-stage-2"), deploy_path]) - - logging.info("Deployment complete") finally: release_deployment_lock() diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2 index 873b174b2c..dd099f4cb6 100755 --- a/scripts/lib/upgrade-zulip-stage-2 +++ b/scripts/lib/upgrade-zulip-stage-2 @@ -77,3 +77,5 @@ subprocess.check_output(["./scripts/restart-server"], preexec_fn=su_to_zulip) if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"): subprocess.check_call(["supervisorctl", "start", "process-fts-updates"], preexec_fn=su_to_zulip) + +logging.info("Upgrade complete!")