summaryrefslogtreecommitdiff
path: root/django/utils/log.py
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-09-16 16:41:38 +0000
committerCarl Meyer <carl@oddbird.net>2011-09-16 16:41:38 +0000
commit343004c4de332bfec09e8a57de775a46fecb18f9 (patch)
tree728d54b838e45651609432a00b0f84a07f9649bf /django/utils/log.py
parentf9dad46d3665214ac80af06371fae10c55605086 (diff)
Fixed #16568 -- Added RequireDebugFalse filter to prevent sending 500 error emails when DEBUG is True in projects with no explicit LOGGING setting. Thanks to Andreas Pelme for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/log.py')
-rw-r--r--django/utils/log.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index a8098fcd2a..8ce37f5309 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -30,6 +30,7 @@ logger = getLogger('django')
if not logger.handlers:
logger.addHandler(NullHandler())
+
class AdminEmailHandler(logging.Handler):
"""An exception log handler that emails log entries to site admins.
@@ -82,8 +83,12 @@ class CallbackFilter(logging.Filter):
def __init__(self, callback):
self.callback = callback
-
def filter(self, record):
if self.callback(record):
return 1
return 0
+
+
+class RequireDebugFalse(logging.Filter):
+ def filter(self, record):
+ return not settings.DEBUG