diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-12 18:17:11 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-12 18:17:11 +0000 |
| commit | 963256638d5b3c3edee14bfbd7c00944b45d04c0 (patch) | |
| tree | 1dea83e095f847f538dc0aa3b1aad47e55b60788 /synapse/federation/federation_server.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-963256638d5b3c3edee14bfbd7c00944b45d04c0.tar.xz | |
Correctly handle all the places that can throw exceptions
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index b23f72c7fa..9f5c98694c 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -411,9 +411,12 @@ class FederationServer(FederationBase): "_handle_new_pdu getting state for %s", pdu.room_id ) - state, auth_chain = yield self.get_state_for_room( - origin, pdu.room_id, pdu.event_id, - ) + try: + state, auth_chain = yield self.get_state_for_room( + origin, pdu.room_id, pdu.event_id, + ) + except: + logger.warn("Failed to get state for event: %s", pdu.event_id) ret = yield self.handler.on_receive_pdu( origin, |