diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-27 08:48:41 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-01 12:40:00 +0000 |
| commit | 0cbda53819dd66df05c872ea021767336b457769 (patch) | |
| tree | d54d1da6132cb79c499ba5b4f50d31ea2a1389e9 /synapse/handlers/federation.py | |
| parent | Merge pull request #2838 from matrix-org/rav/fix_logging_on_dns_fail (diff) | |
| download | synapse-0cbda53819dd66df05c872ea021767336b457769.tar.xz | |
Rename resolve_state_groups -> resolve_state_groups_for_events
(to make way for a method that actually just does the state group resolution)
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 677532c87b..8ee9434c9b 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -808,13 +808,12 @@ class FederationHandler(BaseHandler): event_ids = list(extremities.keys()) logger.debug("calling resolve_state_groups in _maybe_backfill") + resolve = logcontext.preserve_fn( + self.state_handler.resolve_state_groups_for_events + ) states = yield logcontext.make_deferred_yieldable(defer.gatherResults( - [ - logcontext.preserve_fn(self.state_handler.resolve_state_groups)( - room_id, [e] - ) - for e in event_ids - ], consumeErrors=True, + [resolve(room_id, [e]) for e in event_ids], + consumeErrors=True, )) states = dict(zip(event_ids, [s.state for s in states])) |