summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-05-27 11:44:19 +0100
committerGitHub <noreply@github.com>2020-05-27 11:44:19 +0100
commit9bac5d62b33f34c25bed27824a12d697b8b6b163 (patch)
treeb253f5e07c2d5879f36cb7b9b0ac39e18ebe87db
parentRemove the changes to the debian changelog (diff)
downloadsynapse-9bac5d62b33f34c25bed27824a12d697b8b6b163.tar.xz
Ensure ReplicationStreamer is always started when replication enabled. (#7579)
Fixes #7566.
-rw-r--r--changelog.d/7579.bugfix1
-rw-r--r--synapse/replication/tcp/handler.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/7579.bugfix b/changelog.d/7579.bugfix
new file mode 100644

index 0000000000..54542b6026 --- /dev/null +++ b/changelog.d/7579.bugfix
@@ -0,0 +1 @@ +Fix bug where `ReplicationStreamer` was not always started when replication was enabled. Bug introduced in v1.14.0rc1. diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py
index 03300e5336..cbcf46f3ae 100644 --- a/synapse/replication/tcp/handler.py +++ b/synapse/replication/tcp/handler.py
@@ -159,6 +159,9 @@ class ReplicationCommandHandler: hs.config.redis_port, ) + # First let's ensure that we have a ReplicationStreamer started. + hs.get_replication_streamer() + # We need two connections to redis, one for the subscription stream and # one to send commands to (as you can't send further redis commands to a # connection after SUBSCRIBE is called).