diff options
| author | David Baker <dave@matrix.org> | 2015-12-21 15:30:26 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-12-21 15:30:26 +0000 |
| commit | c061b47c575927b4d93b397b1f88233b8205baab (patch) | |
| tree | a82fd06b08a9e7c268b5bbad9a6d8a718a9c9c14 /synapse/http | |
| parent | Only run pushers for users on this hs! (diff) | |
| parent | Remove accidentally committed debug logging (diff) | |
| download | synapse-c061b47c575927b4d93b397b1f88233b8205baab.tar.xz | |
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index c44bdfc888..682b6b379b 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -15,7 +15,7 @@ from synapse.api.errors import ( - cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError + cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError, Codes ) from synapse.util.logcontext import LoggingContext, PreserveLoggingContext import synapse.metrics @@ -127,7 +127,10 @@ def request_handler(request_handler): respond_with_json( request, 500, - {"error": "Internal server error"}, + { + "error": "Internal server error", + "errcode": Codes.UNKNOWN, + }, send_cors=True ) return wrapped_request_handler |