diff options
author | Andrej Shadura <andrewsh@debian.org> | 2019-07-26 12:56:53 -0300 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2019-07-26 12:56:53 -0300 |
commit | 510a9ebe26ed04c0a834f0b3ba2057896fc3aedb (patch) | |
tree | 865b30880f1a611dbed3958da1121b5ccccc989e /synapse/storage/_base.py | |
parent | 2c2556601d5da4ffb4205200d95e77439dc5f560 (diff) |
New upstream version 1.2.1
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r-- | synapse/storage/_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 29589853..2f940dba 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -30,12 +30,12 @@ from prometheus_client import Histogram from twisted.internet import defer from synapse.api.errors import StoreError +from synapse.logging.context import LoggingContext, PreserveLoggingContext from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage.engines import PostgresEngine, Sqlite3Engine from synapse.types import get_domain_from_id from synapse.util import batch_iter from synapse.util.caches.descriptors import Cache -from synapse.util.logcontext import LoggingContext, PreserveLoggingContext from synapse.util.stringutils import exception_to_unicode # import a function which will return a monotonic time, in seconds |