diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-21 14:54:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-21 14:54:40 +0100 |
| commit | a551c5dad7e3643f36654a374f6a0d5700b7ea7f (patch) | |
| tree | 890d81728370049070b959af72390fee80504f7c /synapse/federation | |
| parent | Handle the case when things return empty but non none things (diff) | |
| parent | s/for events/for requests for events/ (diff) | |
| download | synapse-a551c5dad7e3643f36654a374f6a0d5700b7ea7f.tar.xz | |
Merge pull request #155 from matrix-org/erikj/perf
Bulk and batch retrieval of events.
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 904c7c0945..3a7bc0c9a7 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -222,7 +222,7 @@ class FederationClient(FederationBase): for p in transaction_data["pdus"] ] - if pdu_list: + if pdu_list and pdu_list[0]: pdu = pdu_list[0] # Check signatures are correct. @@ -255,7 +255,7 @@ class FederationClient(FederationBase): ) continue - if self._get_pdu_cache is not None: + if self._get_pdu_cache is not None and pdu: self._get_pdu_cache[event_id] = pdu defer.returnValue(pdu) @@ -561,7 +561,7 @@ class FederationClient(FederationBase): res = yield defer.DeferredList(deferreds, consumeErrors=True) for (result, val), (e_id, _) in zip(res, ordered_missing): - if result: + if result and val: signed_events.append(val) else: failed_to_fetch.add(e_id) |