summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-02-01 14:18:07 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-02-01 14:18:07 +0000
commit9a82eb6ff109e95dbb6cf26ee3d2ce1c548714bb (patch)
tree1938ab46e59133b4d172e21cc4f1e3a7e8e90d88 /django/utils
parent00fda7f45db2425c1dcb5d927093ede45734d841 (diff)
Fixed #14972 -- Ensure that the HTML email logger always produces useful output, regardless of whether it has been given an exception or a request. Thanks to jamstooks for the report, and bpeschier for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/log.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index 1f6dc52849..784035b3cf 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -83,7 +83,7 @@ class AdminEmailHandler(logging.Handler):
exc_info = record.exc_info
stack_trace = '\n'.join(traceback.format_exception(*record.exc_info))
else:
- exc_info = ()
+ exc_info = (None, record.msg, None)
stack_trace = 'No stack trace available'
message = "%s\n\n%s" % (stack_trace, request_repr)