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/replication/tcp | |
| parent | 2c2556601d5da4ffb4205200d95e77439dc5f560 (diff) | |
New upstream version 1.2.1
Diffstat (limited to 'synapse/replication/tcp')
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index 97efb835..5ffdf267 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -62,9 +62,9 @@ from twisted.internet import defer from twisted.protocols.basic import LineOnlyReceiver from twisted.python.failure import Failure +from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.metrics import LaterGauge from synapse.metrics.background_process_metrics import run_as_background_process -from synapse.util.logcontext import make_deferred_yieldable, run_in_background from synapse.util.stringutils import random_string from .commands import ( |