summary refs log tree commit diff
path: root/synapse/replication/tcp/protocol.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-08-31 11:40:37 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-08-31 11:40:37 +0100
commit06690b167ac3d5bcc64f716d2677f7ab715d5215 (patch)
tree707b626e634dfaa207271824686609557139719d /synapse/replication/tcp/protocol.py
parentMerge tag 'v1.32.0' into babolivier/dinsic_1.41.0 (diff)
parentA regression can't be introduced twice (diff)
downloadsynapse-06690b167ac3d5bcc64f716d2677f7ab715d5215.tar.xz
Merge tag 'v1.32.2' into babolivier/dinsic_1.41.0
Synapse 1.32.2 (2021-04-22)
===========================

This release includes a fix for a regression introduced in 1.32.0.

Bugfixes
--------

- Fix a regression in Synapse 1.32.0 and 1.32.1 which caused `LoggingContext` errors in plugins. ([\#9857](https://github.com/matrix-org/synapse/issues/9857))
Diffstat (limited to 'synapse/replication/tcp/protocol.py')
-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 ba753318bd..d10d574246 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py
@@ -185,7 +185,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):