paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

AdminHumbugHandler: Fix subject computation in exception case.

Browse Source 
(imported from commit 8205d9ab609fa8bad2471d04ac3e4a0a0edb337d)
This commit is contained in:
Tim Abbott
2013-01-02 17:25:40 -05:00
parent e590c914a6
commit 5a111f6234
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zephyr/handlers.py
View File

@@ -1,6 +1,7 @@
import sys import sys
import logging import logging
import traceback import traceback
import platform
from django.utils.timezone import now from django.utils.timezone import now
from django.views.debug import get_exception_reporter_filter from django.views.debug import get_exception_reporter_filter
@@ -24,12 +25,9 @@ class AdminHumbugHandler(logging.Handler):
create_stream_if_needed, get_client, internal_send_message create_stream_if_needed, get_client, internal_send_message
from django.conf import settings from django.conf import settings
subject = '%s: %s' % (platform.node(), record.getMessage())
try: try:
request = record.request request = record.request
subject = '%s: %s' % (
request.META["SERVER_NAME"],
record.getMessage()
)
filter = get_exception_reporter_filter(request) filter = get_exception_reporter_filter(request)
request_repr = "Request info:\n~~~~\n" request_repr = "Request info:\n~~~~\n"
@@ -42,11 +40,6 @@ class AdminHumbugHandler(logging.Handler):
request_repr += "- %s: \"%s\"\n" % (field, request.META.get(field, "(None)")) request_repr += "- %s: \"%s\"\n" % (field, request.META.get(field, "(None)"))
request_repr += "~~~~" request_repr += "~~~~"
except Exception: except Exception:
subject = '%s: %s' % (
request.META["SERVER_NAME"],
record.getMessage()
)
request = None
request_repr = "Request repr() unavailable." request_repr = "Request repr() unavailable."
subject = self.format_subject(subject) subject = self.format_subject(subject)