diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-12 14:00:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-12 14:00:31 +0100 |
| commit | a0dfffb33cf8ca721526be0c6a1e05199f2b6258 (patch) | |
| tree | 161bf56970656ca06eb0a6ceed31f02185f5c3f0 /synapse/handlers | |
| parent | Err, gatherResults doesn't take a dict... (diff) | |
| download | synapse-a0dfffb33cf8ca721526be0c6a1e05199f2b6258.tar.xz | |
And another typo.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 31c09365e3..6f97127aec 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -274,7 +274,7 @@ class FederationHandler(BaseHandler): if current_depth > max_depth: logger.debug( "Not backfilling as we don't need to. %d < %d", - current_depth, max_depth, + max_depth, current_depth, ) return @@ -364,10 +364,10 @@ class FederationHandler(BaseHandler): event_ids = list(extremities.keys()) states = yield defer.gatherResults([ - self.state_handler.resolve_state_groups([e])[1] + self.state_handler.resolve_state_groups([e]) for e in event_ids ]) - states = dict(zip(event_ids, states)) + states = dict(zip(event_ids, [s[1] for s in states])) for e_id, _ in sorted_extremeties_tuple: likely_domains = get_domains_from_state(states[e_id])[0] |