From bf2ee2e68641d7bdfcacff280d209c8b139cb40e Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 29 Sep 2017 22:29:23 -0700 Subject: [PATCH] settings: Cleanup logic for ANALYTICS_LOCK_PATH. We can use the standard ZULIP_PATHS system for this rather code in dev_settings.py. --- zproject/dev_settings.py | 1 - zproject/settings.py | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/zproject/dev_settings.py b/zproject/dev_settings.py index 8f1240230d..b2f8f36bd1 100644 --- a/zproject/dev_settings.py +++ b/zproject/dev_settings.py @@ -48,7 +48,6 @@ POST_MIGRATION_CACHE_FLUSHING = True # type: bool # Enable inline open graph preview in development for now INLINE_URL_EMBED_PREVIEW = True -ANALYTICS_LOCK_DIR = "var/analytics-lock-dir" # Don't require anything about password strength in development PASSWORD_MIN_LENGTH = 0 diff --git a/zproject/settings.py b/zproject/settings.py index 23df9b40e6..3d71f91054 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -233,11 +233,6 @@ DEFAULT_SETTINGS.update({ # this is disabled in production, but we need it in development. 'POST_MIGRATION_CACHE_FLUSHING': False, - # Lock directory for analytics. - # TODO: This should almost certainly be removed from - # DEFAULT_SETTINGS and put somewhere else in settings.py. - 'ANALYTICS_LOCK_DIR': "/home/zulip/deployments/analytics-lock-dir", - # Settings for APNS. Only needed on push.zulipchat.com. 'APNS_CERT_FILE': None, 'APNS_KEY_FILE': None, @@ -1124,6 +1119,7 @@ ZULIP_PATHS = [ ("STATS_DIR", "/home/zulip/stats"), ("DIGEST_LOG_PATH", "/var/log/zulip/digest.log"), ("ANALYTICS_LOG_PATH", "/var/log/zulip/analytics.log"), + ("ANALYTICS_LOCK_DIR", "/home/zulip/deployments/analytics-lock-dir"), ("API_KEY_ONLY_WEBHOOK_LOG_PATH", "/var/log/zulip/webhooks_errors.log"), ("SOFT_DEACTIVATION_LOG_PATH", "/var/log/zulip/soft_deactivation.log"), ] @@ -1139,8 +1135,8 @@ for (var, path) in ZULIP_PATHS: if DEVELOPMENT: # if DEVELOPMENT, store these files in the Zulip checkout path = os.path.join(DEVELOPMENT_LOG_DIRECTORY, os.path.basename(path)) - # only `JSON_PERSISTENT_QUEUE_FILENAME` will be stored in `var` - if var == 'JSON_PERSISTENT_QUEUE_FILENAME': + # Some things we just want to store in var/ + if var in ['JSON_PERSISTENT_QUEUE_FILENAME', 'ANALYTICS_LOCK_DIR']: path = os.path.join(os.path.join(DEPLOY_ROOT, 'var'), os.path.basename(path)) vars()[var] = path