From 522ccf8eb2db177b5d67680d00a69f09c0d0ca19 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Mon, 18 Jul 2016 21:41:55 -0700
Subject: [PATCH] settings: Extract settings.STAGING_ERROR_NOTIFICATIONS.

---
 zerver/logging_handlers.py | 2 +-
 zproject/local_settings.py | 1 +
 zproject/settings.py       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/zerver/logging_handlers.py b/zerver/logging_handlers.py
index 440ba60153..bae321319f 100644
--- a/zerver/logging_handlers.py
+++ b/zerver/logging_handlers.py
@@ -68,7 +68,7 @@ class AdminZulipHandler(logging.Handler):
             )
 
         try:
-            if settings.ZULIP_COM_STAGING:
+            if settings.STAGING_ERROR_NOTIFICATIONS:
                 # On staging, process the report directly so it can happen inside this
                 # try/except to prevent looping
                 from zilencer.error_notify import notify_server_error
diff --git a/zproject/local_settings.py b/zproject/local_settings.py
index e12abd9d1b..01de8b5a62 100644
--- a/zproject/local_settings.py
+++ b/zproject/local_settings.py
@@ -55,6 +55,7 @@ STATSD_HOST = 'stats.zulip.net'
 if ZULIP_COM_STAGING:
     EXTERNAL_HOST = 'staging.zulip.com'
     STATSD_PREFIX = 'staging'
+    STAGING_ERROR_NOTIFICATIONS = True
 else:
     EXTERNAL_HOST = 'zulip.com'
     EXTERNAL_API_PATH = 'api.zulip.com'
diff --git a/zproject/settings.py b/zproject/settings.py
index 7e65bfe1b5..b94d897f3c 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -113,6 +113,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
                     'MAX_FILE_UPLOAD_SIZE': 25,
                     'DROPBOX_APP_KEY': '',
                     'ERROR_REPORTING': True,
+                    'STAGING_ERROR_NOTIFICATIONS': False,
                     'JWT_AUTH_KEYS': {},
                     'NAME_CHANGES_DISABLED': False,
                     'DEPLOYMENT_ROLE_NAME': "",