diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-05 10:54:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-05 10:54:22 +0000 |
| commit | 18e3a16e8b2303e6b638f679b5b8533e329cbe7a (patch) | |
| tree | 93b4f34678d9521e39d54585d6adc66319514bcd /synapse/storage/stream.py | |
| parent | Merge pull request #2737 from Valodim/master (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-18e3a16e8b2303e6b638f679b5b8533e329cbe7a.tar.xz | |
Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0
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, ) |