Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

Fixed #20844 -- Made AdminEmailHandler respect LOGGING 'formatter' setting.

Browse Source
This commit is contained in:
Daniel Sokolowski 2013-09-12 10:04:28 -04:00 committed by Tim Graham
parent 9451d8d558
commit ad6fcdb8d2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/log.py
View File

@ -84,24 +84,22 @@ class AdminEmailHandler(logging.Handler):
record.getMessage() record.getMessage()
) )
filter = get_exception_reporter_filter(request) filter = get_exception_reporter_filter(request)
request_repr = filter.get_request_repr(request) request_repr = '\n{0}'.format(filter.get_request_repr(request))
except Exception: except Exception:
subject = '%s: %s' % ( subject = '%s: %s' % (
record.levelname, record.levelname,
record.getMessage() record.getMessage()
) )
request = None request = None
request_repr = "Request repr() unavailable." request_repr = "unavailable"
subject = self.format_subject(subject) subject = self.format_subject(subject)
if record.exc_info: if record.exc_info:
exc_info = record.exc_info exc_info = record.exc_info
stack_trace = '\n'.join(traceback.format_exception(*record.exc_info))
else: else:
exc_info = (None, record.getMessage(), None) exc_info = (None, record.getMessage(), None)
stack_trace = 'No stack trace available'
message = "%s\n\n%s" % (stack_trace, request_repr) message = "%s\n\nRequest repr(): %s" % (self.format(record), request_repr)
reporter = ExceptionReporter(request, is_email=True, *exc_info) reporter = ExceptionReporter(request, is_email=True, *exc_info)
html_message = reporter.get_traceback_html() if self.include_html else None html_message = reporter.get_traceback_html() if self.include_html else None
mail.mail_admins(subject, message, fail_silently=True, mail.mail_admins(subject, message, fail_silently=True,