diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:17:47 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:17:47 +0000 |
| commit | 84b78c3b5fe3f5e82c3fdf1a2a1c7eed62e1b887 (patch) | |
| tree | 0475ae5759bd17bc76780a7f376e8a7bd900a430 /synapse/http/server.py | |
| parent | Split up replication_layer module into client, server and transaction queue (diff) | |
| parent | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... (diff) | |
| download | synapse-84b78c3b5fe3f5e82c3fdf1a2a1c7eed62e1b887.tar.xz | |
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 8015a22edf..0f6539e1be 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -16,7 +16,7 @@ from synapse.http.agent_name import AGENT_NAME from synapse.api.errors import ( - cs_exception, SynapseError, CodeMessageException + cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError ) from synapse.util.logcontext import LoggingContext @@ -139,11 +139,7 @@ class JsonResource(HttpServer, resource.Resource): return # Huh. No one wanted to handle that? Fiiiiiine. Send 400. - self._send_response( - request, - 400, - {"error": "Unrecognized request"} - ) + raise UnrecognizedRequestError() except CodeMessageException as e: if isinstance(e, SynapseError): logger.info("%s SynapseError: %s - %s", request, e.code, e.msg) |