diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-11-30 01:51:38 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2017-11-30 01:51:38 +0000 |
| commit | f397153dfc4020744e1cf8687abb01d4b7885a7a (patch) | |
| tree | 342da238d1e7de6178731ad6a040bf9c3de16ce1 /synapse/http/server.py | |
| parent | specify default user_directory_include_pattern (diff) | |
| parent | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments (diff) | |
| download | synapse-f397153dfc4020744e1cf8687abb01d4b7885a7a.tar.xz | |
Merge branch 'develop' into matthew/search-all-local-users
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 3ca1c9947c..25466cd292 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -28,6 +28,7 @@ from canonicaljson import ( ) from twisted.internet import defer +from twisted.python import failure from twisted.web import server, resource from twisted.web.server import NOT_DONE_YET from twisted.web.util import redirectTo @@ -131,12 +132,17 @@ def wrap_request_handler(request_handler, include_metrics=False): version_string=self.version_string, ) except Exception: - logger.exception( - "Failed handle request %s.%s on %r: %r", + # failure.Failure() fishes the original Failure out + # of our stack, and thus gives us a sensible stack + # trace. + f = failure.Failure() + logger.error( + "Failed handle request %s.%s on %r: %r: %s", request_handler.__module__, request_handler.__name__, self, - request + request, + f.getTraceback().rstrip(), ) respond_with_json( request, |