diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
| commit | 897c51d2742bead151a6306cd236b517982b8a69 (patch) | |
| tree | 75f588d3949381a3d049eb5f192dba4ded09d0ec /synapse/replication/http/send_event.py | |
| parent | update generate_monthly_active_users, and reap_monthly_active_users (diff) | |
| parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
| download | synapse-897c51d2742bead151a6306cd236b517982b8a69.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker
Diffstat (limited to 'synapse/replication/http/send_event.py')
| -rw-r--r-- | synapse/replication/http/send_event.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/replication/http/send_event.py b/synapse/replication/http/send_event.py index 5227bc333d..d3509dc288 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -18,11 +18,7 @@ import re from twisted.internet import defer -from synapse.api.errors import ( - CodeMessageException, - MatrixCodeMessageException, - SynapseError, -) +from synapse.api.errors import CodeMessageException, HttpResponseException from synapse.events import FrozenEvent from synapse.events.snapshot import EventContext from synapse.http.servlet import RestServlet, parse_json_object_from_request @@ -83,11 +79,11 @@ def send_event_to_master(clock, store, client, host, port, requester, event, con # If we timed out we probably don't need to worry about backing # off too much, but lets just wait a little anyway. yield clock.sleep(1) - except MatrixCodeMessageException as e: + except HttpResponseException as e: # We convert to SynapseError as we know that it was a SynapseError # on the master process that we should send to the client. (And # importantly, not stack traces everywhere) - raise SynapseError(e.code, e.msg, e.errcode) + raise e.to_synapse_error() defer.returnValue(result) |