From 0374664fb50545cf81635998da6113adc94e045d Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 29 Sep 2017 22:33:32 -0700 Subject: [PATCH] settings: Clean up ZULIP_PATHS conditionals. This replaces the ugly fixed list of things that don't go into var/log with a reasonable test based on the actual path. --- zproject/settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zproject/settings.py b/zproject/settings.py index 85a152f4d7..0dd75bf369 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -1132,9 +1132,9 @@ else: 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)) - # Some things we just want to store in var/ - if var in ['JSON_PERSISTENT_QUEUE_FILENAME', 'ANALYTICS_LOCK_DIR']: + if path.startswith("/var/log"): + path = os.path.join(DEVELOPMENT_LOG_DIRECTORY, os.path.basename(path)) + else: path = os.path.join(os.path.join(DEPLOY_ROOT, 'var'), os.path.basename(path)) vars()[var] = path