paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: logging configuration to consistently email errors.

Browse Source 
This fixes 2 issues:
* Some exceptions were not being properly emailed to admins.

* A bug in the parens placement in the default Zulip handlers list
  resulted in the console/file handlers being accidentally excluded if
  !ERROR_REPORTING.

Fixes #4127.
This commit is contained in:
Tim Abbott
2017-03-21 00:37:39 -07:00
parent 24295e6ac8
commit 79ad174ad3
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zproject/settings.py
View File

@@ -1010,6 +1010,11 @@ else:
# Used for test_logging_handlers
LOGGING_NOT_DISABLED = True
DEFAULT_ZULIP_HANDLERS = (
(['zulip_admins'] if ERROR_REPORTING else []) +
['console', 'file', 'errors_file']
)
LOGGING = {
'version': 1,
'disable_existing_loggers': True,
@@ -1077,24 +1082,23 @@ LOGGING = {
},
'loggers': {
'': {
'handlers': ['console', 'file', 'errors_file'],
'handlers': DEFAULT_ZULIP_HANDLERS,
'filters': ['require_logging_enabled'],
'level': 'INFO',
'propagate': False,
},
'django': {
'handlers': (['zulip_admins'] if ERROR_REPORTING else [] +
['console', 'file', 'errors_file']),
'handlers': DEFAULT_ZULIP_HANDLERS,
'level': 'INFO',
'propagate': False,
},
'zulip.requests': {
'handlers': ['console', 'file', 'errors_file'],
'handlers': DEFAULT_ZULIP_HANDLERS,
'level': 'INFO',
'propagate': False,
},
'zulip.queue': {
'handlers': ['console', 'file', 'errors_file'],
'handlers': DEFAULT_ZULIP_HANDLERS,
'level': 'WARNING',
'propagate': False,
},
@@ -1104,7 +1108,7 @@ LOGGING = {
'propagate': False,
},
'requests': {
'handlers': ['console', 'file', 'errors_file'],
'handlers': DEFAULT_ZULIP_HANDLERS,
'level': 'WARNING',
'propagate': False,
},