summary refs log tree commit diff
path: root/synapse/replication/tcp/handler.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-05-11 13:09:14 +0100
committerRichard van der Hoff <richard@matrix.org>2020-05-11 13:09:14 +0100
commit309e30bae3d2391d57fabfa78fdb6bdd662c3de7 (patch)
tree8fd1ba58c97d9a3a3c1867f3404ab720355f210c /synapse/replication/tcp/handler.py
parentRevert emergency registration patches (diff)
parentRework UI Auth session validation for registration (#7455) (diff)
downloadsynapse-309e30bae3d2391d57fabfa78fdb6bdd662c3de7.tar.xz
Merge remote-tracking branch 'origin/release-v1.13.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/replication/tcp/handler.py')
-rw-r--r--synapse/replication/tcp/handler.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py

index b14a3d9fca..4328b38e9d 100644 --- a/synapse/replication/tcp/handler.py +++ b/synapse/replication/tcp/handler.py
@@ -131,10 +131,9 @@ class ReplicationCommandHandler: import txredisapi logger.info( - "Connecting to redis (host=%r port=%r DBID=%r)", + "Connecting to redis (host=%r port=%r)", hs.config.redis_host, hs.config.redis_port, - hs.config.redis_dbid, ) # We need two connections to redis, one for the subscription stream and @@ -145,7 +144,6 @@ class ReplicationCommandHandler: outbound_redis_connection = txredisapi.lazyConnection( host=hs.config.redis_host, port=hs.config.redis_port, - dbid=hs.config.redis_dbid, password=hs.config.redis.redis_password, reconnect=True, )