Ticket #14972: adminemailhandler.patch

django/utils/log.py

@@ -80 +80 @@
             request_repr = "Request repr() unavailable"
 
         if record.exc_info:
-            exc_info = record.exc_info
-            stack_trace = '\n'.join(traceback.format_exception(*record.exc_info))
+            message = '\nSTACK_TRACE:\n'.join(traceback.format_exception(*record.exc_info))
+            reporter = ExceptionReporter(request, is_email=True, *record.exc_info)
+            html_message = reporter.get_traceback_html()
         else:
-            exc_info = ()
-            stack_trace = 'No stack trace available'
-
-        message = "%s\n\n%s" % (stack_trace, request_repr)
-        reporter = ExceptionReporter(request, is_email=True, *exc_info)
-        html_message = reporter.get_traceback_html()
+            message = '\n%s\n\nNo stack trace available' % record.msg
+            html_message = None
+            
+        message = "%s\n\n%s" % (message, request_repr)
         mail.mail_admins(subject, message, fail_silently=True,
                          html_message=html_message)