summaryrefslogtreecommitdiff
path: root/django/utils/log.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-03-23 18:17:43 -0400
committerTim Graham <timograham@gmail.com>2015-04-24 11:07:42 -0400
commit8efea1b8d5b5fb0cfef1a3244c339cebf8af36c5 (patch)
tree31d7ef33be2de88e47d2f6a1e698d210dd09baa2 /django/utils/log.py
parent37682368a604e08f3135375c85529e566492a352 (diff)
Fixed #24526 -- Combined django.request/security loggers with the root logger.
Thanks Carl Meyer for review.
Diffstat (limited to 'django/utils/log.py')
-rw-r--r--django/utils/log.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index 7ccc532a05..22452f994c 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -40,17 +40,7 @@ DEFAULT_LOGGING = {
},
'loggers': {
'django': {
- 'handlers': ['console'],
- },
- 'django.request': {
- 'handlers': ['mail_admins'],
- 'level': 'ERROR',
- 'propagate': False,
- },
- 'django.security': {
- 'handlers': ['mail_admins'],
- 'level': 'ERROR',
- 'propagate': False,
+ 'handlers': ['console', 'mail_admins'],
},
'py.warnings': {
'handlers': ['console'],