summary refs log tree commit diff
path: root/synapse/visibility.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-14 11:22:42 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-14 11:22:42 +0000
commit7e6fa29cb5ba1abd8b4f3873b0ef171c7c8aba26 (patch)
treefefec86e319c859109830b7e1a92dfb07574b90d /synapse/visibility.py
parentMerge pull request #2668 from turt2live/travis/whoami (diff)
downloadsynapse-7e6fa29cb5ba1abd8b4f3873b0ef171c7c8aba26.tar.xz
Remove preserve_context_over_{fn, deferred}
Both of these functions ae known to leak logcontexts. Replace the remaining
calls to them and kill them off.
Diffstat (limited to '')
-rw-r--r--synapse/visibility.py4
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,