diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-07-08 15:49:23 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-07-08 15:49:23 +0100 |
| commit | 57eacee4f4cff3a663a6e22834a82f9c5783a56d (patch) | |
| tree | b5714f78b8c129ad8aca1689e2d7ddecb20c3bed /synapse/storage/stream.py | |
| parent | Changelog (diff) | |
| parent | Update ModuleApi to avoid register(generate_token=True) (#5640) (diff) | |
| download | synapse-57eacee4f4cff3a663a6e22834a82f9c5783a56d.tar.xz | |
Merge branch 'develop' into babolivier/invite-json
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index d9482a3843..386a9dbe14 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -41,12 +41,12 @@ from six.moves import range from twisted.internet import defer +from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.storage._base import SQLBaseStore from synapse.storage.engines import PostgresEngine from synapse.storage.events_worker import EventsWorkerStore from synapse.types import RoomStreamToken from synapse.util.caches.stream_change_cache import StreamChangeCache -from synapse.util.logcontext import make_deferred_yieldable, run_in_background logger = logging.getLogger(__name__) |