From b6094b8e916f76362bea397482ba30a66f95bef4 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 25 Apr 2017 13:46:11 -0700 Subject: [PATCH] logging_handlers: Fix missing host key in queue errors. This fixes exceptions thrown when trying to report errors from queue processors to email. --- zerver/logging_handlers.py | 1 + zerver/tests/test_logging_handlers.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/zerver/logging_handlers.py b/zerver/logging_handlers.py index f37fdafac3..4340d1099f 100644 --- a/zerver/logging_handlers.py +++ b/zerver/logging_handlers.py @@ -77,6 +77,7 @@ class AdminZulipHandler(logging.Handler): report = dict( node = platform.node(), + host = platform.node(), message = message, stack_trace = stack_trace, ) diff --git a/zerver/tests/test_logging_handlers.py b/zerver/tests/test_logging_handlers.py index ad14ed2789..0faf423a12 100644 --- a/zerver/tests/test_logging_handlers.py +++ b/zerver/tests/test_logging_handlers.py @@ -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)