summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-25 17:26:30 +0000
committerGitHub <noreply@github.com>2019-02-25 17:26:30 +0000
commit65f3fbfbf75ab4877c75a99d4a11588117a9a433 (patch)
treeb20ba34cbab5e4c54f79382368010813dd3f0967 /synapse/http/server.py
parentMerge pull request #4718 from matrix-org/erikj/fix_backfill_state_shred (diff)
parentNewsfile (diff)
downloadsynapse-65f3fbfbf75ab4877c75a99d4a11588117a9a433.tar.xz
Merge pull request #4737 from matrix-org/erikj/failure_log_tb
Log tracebacks correctly
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py
index 6c67a25a11..16fb7935da 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -169,18 +169,18 @@ def _return_html_error(f, request):
             )
         else:
             logger.error(
-                "Failed handle request %r: %s",
+                "Failed handle request %r",
                 request,
-                f.getTraceback().rstrip(),
+                exc_info=(f.type, f.value, f.getTracebackObject()),
             )
     else:
         code = http_client.INTERNAL_SERVER_ERROR
         msg = "Internal server error"
 
         logger.error(
-            "Failed handle request %r: %s",
+            "Failed handle request %r",
             request,
-            f.getTraceback().rstrip(),
+            exc_info=(f.type, f.value, f.getTracebackObject()),
         )
 
     body = HTML_ERROR_TEMPLATE.format(