CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-15 21:01:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

settings: Cleanup logic for ANALYTICS_LOCK_PATH.

Browse Source 
We can use the standard ZULIP_PATHS system for this rather code in
dev_settings.py.
This commit is contained in:
Tim Abbott 2017-09-29 22:29:23 -07:00
parent ef5a4000a9
commit bf2ee2e686
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zproject/dev_settings.py
View File

@ -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

10
zproject/settings.py
View File

@ -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