diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-11-15 11:13:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 11:13:53 +0000 |
| commit | 1b83c09c034dfbe35b462404da0aca071ae1f65e (patch) | |
| tree | 9020d3f64ad16f8c25b318653b702e91ae34d80b /synapse/handlers/initial_sync.py | |
| parent | Merge pull request #2650 from matrix-org/dbkr/push_include_content_option (diff) | |
| parent | Remove __PreservingContextDeferred too (diff) | |
| download | synapse-1b83c09c034dfbe35b462404da0aca071ae1f65e.tar.xz | |
Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs
Remove preserve_context_over_{fn, deferred}Diffstat (limited to 'synapse/handlers/initial_sync.py')
| -rw-r--r-- | synapse/handlers/initial_sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index 9718d4abc5..c5267b4b84 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -27,7 +27,7 @@ from synapse.types import ( from synapse.util import unwrapFirstError from synapse.util.async import concurrently_execute from synapse.util.caches.snapshot_cache import SnapshotCache -from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred +from synapse.util.logcontext import make_deferred_yieldable, preserve_fn from synapse.visibility import filter_events_for_client from ._base import BaseHandler @@ -163,7 +163,7 @@ class InitialSyncHandler(BaseHandler): lambda states: states[event.event_id] ) - (messages, token), current_state = yield preserve_context_over_deferred( + (messages, token), current_state = yield make_deferred_yieldable( defer.gatherResults( [ preserve_fn(self.store.get_recent_events_for_room)( |