CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

logging_handlers: Fix missing host key in queue errors.

Browse Source 
This fixes exceptions thrown when trying to report errors from queue
processors to email.
This commit is contained in:
Tim Abbott 2017-04-25 13:46:11 -07:00
parent 1cc9cb969b
commit b6094b8e91
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/logging_handlers.py
View File

@ -77,6 +77,7 @@ class AdminZulipHandler(logging.Handler):
report = dict(
node = platform.node(),
host = platform.node(),
message = message,
stack_trace = stack_trace,
)

5
zerver/tests/test_logging_handlers.py
View File

@ -118,6 +118,7 @@ class AdminZulipHandlerTest(ZulipTestCase):
# Check anonymous user is handled correctly
record.request.user = AnonymousUser()
report = self.run_handler(record)
self.assertIn("host", report)
self.assertIn("user_email", report)
self.assertIn("message", report)
self.assertIn("stack_trace", report)
@ -130,6 +131,7 @@ class AdminZulipHandlerTest(ZulipTestCase):
record.request.get_host = get_host_error
report = self.run_handler(record)
record.request.get_host = orig_get_host
self.assertIn("host", report)
self.assertIn("user_email", report)
self.assertIn("message", report)
self.assertIn("stack_trace", report)
@ -140,6 +142,7 @@ class AdminZulipHandlerTest(ZulipTestCase):
record.request.method = "POST"
report = self.run_handler(record)
record.request.method = "GET"
self.assertIn("host", report)
self.assertIn("user_email", report)
self.assertIn("message", report)
self.assertIn("stack_trace", report)
@ -158,6 +161,7 @@ class AdminZulipHandlerTest(ZulipTestCase):
# Test no exc_info
record.exc_info = None
report = self.run_handler(record)
self.assertIn("host", report)
self.assertIn("user_email", report)
self.assertIn("message", report)
self.assertEqual(report["stack_trace"], None)
@ -166,6 +170,7 @@ class AdminZulipHandlerTest(ZulipTestCase):
record.request.user = None
with patch("zerver.logging_handlers.traceback.print_exc"):
report = self.run_handler(record)
self.assertIn("host", report)
self.assertIn("user_email", report)
self.assertIn("message", report)
self.assertIn("stack_trace", report)