From 343004c4de332bfec09e8a57de775a46fecb18f9 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Fri, 16 Sep 2011 16:41:38 +0000 Subject: 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 --- django/utils/log.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'django/utils') 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 -- cgit v1.3