Ticket #15603: logger.diff

docs/topics/logging.txt

@@ -327 +327 @@
           message to stdout. This handler uses the `simple` output
           format.
 
-        * ``mail_admins``, an AdminEmailHandler, which will email any
+        * ``mail_admins``, an AdminEmailHandler, which will e-mail any
           ``ERROR`` level message to the site admins. This handler uses
           the ``special`` filter.
 
@@ -468 +468 @@
 Django provides one log handler in addition to those provided by the
 Python logging module.
 
-.. class:: AdminEmailHandler()
+.. class:: AdminEmailHandler([include_html=False])
 
-    This handler sends an email to the site admins for each log
+    This handler sends an e-mail to the site admins for each log
     message it receives.
 
     If the log record contains a 'request' attribute, the full details
-    of the request will be included in the email.
+    of the request will be included in the e-mail.
 
     If the log record contains stack trace information, that stack
-    trace will be included in the email.
+    trace will be included in the e-mail.
+
+    The ``include_html`` argument of ``AdminEmailHandler`` is used to
+    control whether traceback e-mail sent includes an HTML attachment
+    containing the full content of the debug page that would be produced 
+    if ``DEBUG`` was enabled. To set this value in your configuration, include
+    it in the handler definition for ``django.utils.log.AdminEmailHandler``,
+    for example:: 
+
+        'handlers': { 
+            'mail_admins': { 
+                'level': 'ERROR', 
+                'class': 'django.utils.log.AdminEmailHandler', 
+                'include_html': True, 
+            } 
+        },
+     

django/utils/log.py

@@ -48 +48 @@
     logger.addHandler(NullHandler())
 
 class AdminEmailHandler(logging.Handler):
+    def __init__(self, include_html=False):
+        logging.Handler.__init__(self)        
+        self.include_html = include_html
+
     """An exception log handler that emails log entries to site admins
 
     If the request is passed as the first argument to the log record,
@@ -88 +92 @@
 
         message = "%s\n\n%s" % (stack_trace, request_repr)
         reporter = ExceptionReporter(request, is_email=True, *exc_info)
-        html_message = reporter.get_traceback_html()
+        html_message = self.include_html and reporter.get_traceback_html() or None
         mail.mail_admins(subject, message, fail_silently=True,
                          html_message=html_message)