summary refs log tree commit diff
path: root/synapse/replication/tcp/protocol.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-12-15 08:23:14 -0500
committerPatrick Cloke <patrickc@matrix.org>2020-12-15 08:23:14 -0500
commit33a349df91a459435e33c5676bb40c8690492f65 (patch)
tree475c01ad2e72c69665974a8d4917e4095c3f280c /synapse/replication/tcp/protocol.py
parentMerge branch 'release-v1.24.0' of github.com:matrix-org/synapse into matrix-o... (diff)
parentFix startup failure with localdb_enabled: False (#8937) (diff)
downloadsynapse-33a349df91a459435e33c5676bb40c8690492f65.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/replication/tcp/protocol.py')
-rw-r--r--synapse/replication/tcp/protocol.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py

index a509e599c2..804da994ea 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py
@@ -172,8 +172,7 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver): # a logcontext which we use for processing incoming commands. We declare it as a # background process so that the CPU stats get reported to prometheus. ctx_name = "replication-conn-%s" % self.conn_id - self._logging_context = BackgroundProcessLoggingContext(ctx_name) - self._logging_context.request = ctx_name + self._logging_context = BackgroundProcessLoggingContext(ctx_name, ctx_name) def connectionMade(self): logger.info("[%s] Connection established", self.id())