diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-24 14:28:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-24 14:28:57 +0100 |
| commit | 90d5983d7afa89a4431fea053512190ae83c8f3a (patch) | |
| tree | 6c86dd3497030f7e9b629264e210e05a6ea1ce76 /synapse/storage/stream.py | |
| parent | Bump changelog and version (diff) | |
| parent | Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts (diff) | |
| download | synapse-90d5983d7afa89a4431fea053512190ae83c8f3a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 862c5c3ea1..0577a0525b 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 +from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred from synapse.storage.engines import PostgresEngine, Sqlite3Engine import logging @@ -234,12 +234,12 @@ 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 defer.gatherResults([ + res = yield preserve_context_over_deferred(defer.gatherResults([ preserve_fn(self.get_room_events_stream_for_room)( room_id, from_key, to_key, limit, order=order, ) for room_id in rm_ids - ]) + ])) results.update(dict(zip(rm_ids, res))) defer.returnValue(results) |