diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-12 13:58:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-12 13:58:14 +0100 |
| commit | 6e5ac4a28fe79162e62b68cc62aa4e37badcc8b4 (patch) | |
| tree | e6ae321dc76720076e0c00b6af4f3c4471fa2c13 /synapse | |
| parent | Handle the case where the other side is unreachable when backfilling (diff) | |
| download | synapse-6e5ac4a28fe79162e62b68cc62aa4e37badcc8b4.tar.xz | |
Err, gatherResults doesn't take a dict...
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/federation.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 8b5ac5d6c4..31c09365e3 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -361,10 +361,13 @@ class FederationHandler(BaseHandler): tried_domains = set(likely_domains) - states = yield defer.gatherResults({ - e: self.state_handler.resolve_state_groups([e])[1] - for e in extremities.keys() - }) + event_ids = list(extremities.keys()) + + states = yield defer.gatherResults([ + self.state_handler.resolve_state_groups([e])[1] + for e in event_ids + ]) + states = dict(zip(event_ids, states)) for e_id, _ in sorted_extremeties_tuple: likely_domains = get_domains_from_state(states[e_id])[0] |