diff options
author | Matthew Hodgson <matthew@arasphere.net> | 2015-02-12 20:03:29 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@arasphere.net> | 2015-02-12 20:03:29 +0000 |
commit | 16c6b860ac345296c2ddddc747159731046a6e62 (patch) | |
tree | 0c80c119afa32617a9c238639aca8dee971ba025 /synapse/federation/federation_server.py | |
parent | Merge pull request #69 from matrix-org/hotfixes-v0.7.0a (diff) | |
parent | Fix logging (diff) | |
download | synapse-16c6b860ac345296c2ddddc747159731046a6e62.tar.xz |
Merge pull request #70 from matrix-org/exception-fixes
Exception fixes
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, |