diff options
| author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
| commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
| tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /synapse/storage/stream.py | |
| parent | Copy dict in update_membership too (diff) | |
| parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
| download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index dddd5fc0e7..52bdce5be2 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -39,7 +39,7 @@ from ._base import SQLBaseStore from synapse.util.caches.descriptors import cached from synapse.api.constants import EventTypes from synapse.types import RoomStreamToken -from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred +from synapse.util.logcontext import make_deferred_yieldable, preserve_fn from synapse.storage.engines import PostgresEngine, Sqlite3Engine import logging @@ -234,7 +234,7 @@ class StreamStore(SQLBaseStore): results = {} room_ids = list(room_ids) for rm_ids in (room_ids[i:i + 20] for i in xrange(0, len(room_ids), 20)): - res = yield preserve_context_over_deferred(defer.gatherResults([ + res = yield make_deferred_yieldable(defer.gatherResults([ preserve_fn(self.get_room_events_stream_for_room)( room_id, from_key, to_key, limit, order=order, ) |