paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move STATSD_CONFIGURATION below setting defaults.

Browse Source 
(imported from commit 48d833c672ad96318f738c663c3bea61cd1ec382)
This commit is contained in:
Tim Abbott
2015-08-21 09:58:43 -07:00
parent 83a653efce
commit e78361f985
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
zproject/settings.py
View File

@@ -278,32 +278,6 @@ CACHES = {
},
}
########################################################################
# STATSD CONFIGURATION
########################################################################
LOCAL_STATSD = (False)
USING_STATSD = ZULIP_COM or LOCAL_STATSD
# These must be named STATSD_PREFIX for the statsd module
# to pick them up
if ZULIP_COM_STAGING:
STATSD_PREFIX = 'staging'
elif PRODUCTION:
STATSD_PREFIX = 'app'
else:
STATSD_PREFIX = 'user'
if USING_STATSD:
if LOCAL_STATSD:
STATSD_HOST = 'localhost'
else:
STATSD_HOST = 'stats.zulip.net'
INSTALLED_APPS += ['django_statsd']
STATSD_PORT = 8125
STATSD_CLIENT = 'django_statsd.clients.normal'
########################################################################
# REDIS-BASED RATE LIMITING CONFIGURATION
########################################################################
@@ -500,6 +474,32 @@ if PRODUCTION:
else:
FEEDBACK_TARGET="http://localhost:9991/api"
########################################################################
# STATSD CONFIGURATION
########################################################################
LOCAL_STATSD = (False)
USING_STATSD = ZULIP_COM or LOCAL_STATSD
# These must be named STATSD_PREFIX for the statsd module
# to pick them up
if ZULIP_COM_STAGING:
STATSD_PREFIX = 'staging'
elif PRODUCTION:
STATSD_PREFIX = 'app'
else:
STATSD_PREFIX = 'user'
if USING_STATSD:
if LOCAL_STATSD:
STATSD_HOST = 'localhost'
else:
STATSD_HOST = 'stats.zulip.net'
INSTALLED_APPS += ['django_statsd']
STATSD_PORT = 8125
STATSD_CLIENT = 'django_statsd.clients.normal'
########################################################################
# CAMO HTTPS CACHE CONFIGURATION
########################################################################