diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2015-01-28 15:41:24 +0000 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2015-01-28 15:41:24 +0000 |
| commit | fddc7a080afffee66f715234c535f11b94a4f411 (patch) | |
| tree | efa2745186a2fde64cef7000f79d9e191d53dd13 /synapse/http/server.py | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| parent | Use %s instead of + (diff) | |
| download | synapse-fddc7a080afffee66f715234c535f11b94a4f411.tar.xz | |
Merge pull request #35 from matrix-org/pushers2
Pushers branch (with fixes)
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) |