summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-21 14:55:06 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-21 14:55:06 +0100
commit4b2217ace210a59ac17d47b95bbf0a66d0447368 (patch)
tree1b34223a61ecdd153bdeeaccace3b67c58fbb5b3 /synapse/replication
parentRename handler and config modules which end in handler/config. (#9816) (diff)
parentMerge tag 'v1.32.1' (diff)
downloadsynapse-4b2217ace210a59ac17d47b95bbf0a66d0447368.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/tcp/protocol.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py

index 2df028f315..6860576e78 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py
@@ -184,7 +184,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. self._logging_context = BackgroundProcessLoggingContext( - "replication-conn-%s" % (self.conn_id,) + "replication-conn", self.conn_id ) def connectionMade(self):