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/visibility.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/visibility.py')
| -rw-r--r-- | synapse/visibility.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py index d7dbdc77ff..aaca2c584c 100644 --- a/synapse/visibility.py +++ b/synapse/visibility.py @@ -17,7 +17,7 @@ from twisted.internet import defer from synapse.api.constants import Membership, EventTypes -from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred +from synapse.util.logcontext import make_deferred_yieldable, preserve_fn import logging @@ -58,7 +58,7 @@ def filter_events_for_clients(store, user_tuples, events, event_id_to_state, always_include_ids (set(event_id)): set of event ids to specifically include (unless sender is ignored) """ - forgotten = yield preserve_context_over_deferred(defer.gatherResults([ + forgotten = yield make_deferred_yieldable(defer.gatherResults([ defer.maybeDeferred( preserve_fn(store.who_forgot_in_room), room_id, |