diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-05 18:08:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-05 18:08:32 +0100 |
| commit | 5f360182c65d1ef24417ee284c5a66239beca9fe (patch) | |
| tree | 25f99adcdb9aee38ac3098de107ee1dad689ccac | |
| parent | Retry joining via other servers if first one failed (diff) | |
| download | synapse-5f360182c65d1ef24417ee284c5a66239beca9fe.tar.xz | |
Fix a couple of python bugs
| -rw-r--r-- | synapse/federation/federation_client.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 92332cfdcf..da95c2ad6d 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -236,9 +236,9 @@ class FederationClient(FederationBase): # TODO: Rate limit the number of times we try and get the same event. if self._get_pdu_cache: - e = self._get_pdu_cache.get(event_id) - if e: - defer.returnValue(e) + ev = self._get_pdu_cache.get(event_id) + if ev: + defer.returnValue(ev) pdu = None for destination in destinations: @@ -269,7 +269,7 @@ class FederationClient(FederationBase): break - except SynapseError: + except SynapseError as e: logger.info( "Failed to get PDU %s from %s because %s", event_id, destination, e, @@ -336,8 +336,10 @@ class FederationClient(FederationBase): ev.event_id: ev for ev in fetched_events } - pdus = [event_map[e_id] for e_id in state_event_ids] - auth_chain = [event_map[e_id] for e_id in auth_event_ids] + pdus = [event_map[e_id] for e_id in state_event_ids if e_id in event_map] + auth_chain = [ + event_map[e_id] for e_id in auth_event_ids if e_id in event_map + ] auth_chain.sort(key=lambda e: e.depth) |