Ticket #16736: adminemail_getmessage_patch.2.diff

django/utils/log.py

@@ -53 +53 @@
         except:
             subject = '%s: %s' % (
                 record.levelname,
-                record.msg
+                record.getMessage()
             )
             request = None
             request_repr = "Request repr() unavailable."
@@ -62 +62 @@
             exc_info = record.exc_info
             stack_trace = '\n'.join(traceback.format_exception(*record.exc_info))
         else:
-            exc_info = (None, record.msg, None)
+            exc_info = (None, record.getMessage(), None)
             stack_trace = 'No stack trace available'
 
         message = "%s\n\n%s" % (stack_trace, request_repr)

tests/regressiontests/logging_tests/tests.py

@@ -115 +115 @@
         f.filter("a record")
 
         self.assertEqual(collector, ["a record"])
+
+
+class AdminEmailHandlerTest(TestCase):
+    def test_accepts_args(self):
+        from django.conf import settings
+        from django.core import mail
+        from django.utils.log import getLogger, logging
+
+        old_admins = settings.ADMINS
+        settings.ADMINS = (('whatever admin', 'admin@example.com'),)
+
+        message = "this is my message, and it says '%s'"
+        token = 'token'
+
+        logger = getLogger('django.request')
+        # taken from regressiontests/views/views.py: send_log
+        # ensuring the AdminEmailHandler does not get filtered out
+        # even with DEBUG=True.
+        admin_email_handler = [
+            h for h in logger.handlers
+            if h.__class__.__name__ == "AdminEmailHandler"
+            ][0]
+        orig_filters = admin_email_handler.filters
+        admin_email_handler.filters = []
+
+        logger.error(message, token)
+
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertTrue('token' in mail.outbox[0].subject,
+            "Subject should contain the token")
+
+        admin_email_handler.filters = orig_filters
+        settings.ADMINS = old_admin