diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-20 14:55:16 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-20 14:55:16 +0100 |
commit | 6982db965164ec54a0f5f7cb39b778f6ed0a7306 (patch) | |
tree | fdd66aaf3e4433b0e91b0a708edf280e02058178 /synapse/replication | |
parent | Add presence federation stream (#9819) (diff) | |
parent | Update v1.32.0 changelog. It's m.login.application_service, not plural (diff) | |
download | synapse-6982db965164ec54a0f5f7cb39b778f6ed0a7306.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/replication')
-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 6860576e78..2df028f315 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", self.conn_id + "replication-conn-%s" % (self.conn_id,) ) def connectionMade(self): |