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

Eliminate TESTING_DEPLOYED.

Browse Source 
(imported from commit 477d8b7a15f703df1e10ae5682e02fea5ce040e4)
This commit is contained in:
David Roe
2015-08-20 23:43:31 -07:00
committed by Tim Abbott
parent 59b94a901c
commit 24f6743288
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zproject/settings.py
View File

@@ -28,7 +28,6 @@ DEPLOYED = config_file.has_option('machine', 'deploy_type')
# Zulip run by Zulip, Inc. We will eventually be able to get rid of
# them and just have the DEPLOYED flag, but we need them for now.
STAGING_DEPLOYED = DEPLOYED and config_file.get('machine', 'deploy_type') == 'staging'
TESTING_DEPLOYED = DEPLOYED and config_file.get('machine', 'deploy_type') == 'test'
ENTERPRISE = DEPLOYED and config_file.get('machine', 'deploy_type') == 'enterprise'
secrets_file = ConfigParser.RawConfigParser()
@@ -274,7 +273,7 @@ CACHES = {
########################################################################
LOCAL_STATSD = (False)
USING_STATSD = (DEPLOYED and not TESTING_DEPLOYED and not ENTERPRISE) or LOCAL_STATSD
USING_STATSD = (DEPLOYED and not ENTERPRISE) or LOCAL_STATSD
# These must be named STATSD_PREFIX for the statsd module
# to pick them up