summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-21 20:27:38 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-21 20:32:36 +0100
commitc6e0dedbdb22f4db6577886a2b67e5423684fe7f (patch)
tree956ef268cb422fd2fd143c7992129bbd7643956f
parent7aa538357c8d94df3d5811706bf6dfe5d21421ca (diff)
Fixed #19637 -- Ensured AdminEmailHandler fails silently
Thanks lsaffre for the report. Refs #19325.
-rw-r--r--django/utils/log.py2
-rw-r--r--tests/regressiontests/logging_tests/tests.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index 292bd0794c..b291b86706 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -117,7 +117,7 @@ class AdminEmailHandler(logging.Handler):
connection=self.connection())
def connection(self):
- return get_connection(backend=self.email_backend)
+ return get_connection(backend=self.email_backend, fail_silently=True)
def format_subject(self, subject):
"""
diff --git a/tests/regressiontests/logging_tests/tests.py b/tests/regressiontests/logging_tests/tests.py
index b3d9f3b352..b7d06bf362 100644
--- a/tests/regressiontests/logging_tests/tests.py
+++ b/tests/regressiontests/logging_tests/tests.py
@@ -154,6 +154,10 @@ class AdminEmailHandlerTest(TestCase):
][0]
return admin_email_handler
+ def test_fail_silently(self):
+ admin_email_handler = self.get_admin_email_handler(self.logger)
+ self.assertTrue(admin_email_handler.connection().fail_silently)
+
@override_settings(
ADMINS=(('whatever admin', 'admin@example.com'),),
EMAIL_SUBJECT_PREFIX='-SuperAwesomeSubject-'