Add option to disable error reporting

(imported from commit 3621aa6e7a5badd21b22891026285099db393df0)
This commit is contained in:
Kevin Mehall
2013-11-13 15:35:04 -05:00
parent 08cc6378af
commit 98caa8eaf1
3 changed files with 10 additions and 1 deletions

View File

@@ -245,6 +245,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'MAILCHIMP_API_KEY': '',
'LOCAL_UPLOADS_DIR': None,
'DROPBOX_APP_KEY': '',
'ERROR_REPORTING': True,
# The following bots only exist in non-ENTERPRISE installs
'ERROR_BOT': None,
'NEW_USER_BOT': None,
@@ -653,7 +654,8 @@ LOGGING = {
'propagate': False,
},
'django': {
'handlers': ['zulip_admins', 'console', 'file'],
'handlers': (['zulip_admins'] if ERROR_REPORTING else [])
+ ['console', 'file'],
'level': 'INFO',
'propagate': False,
},