diff --git a/changelog.d/7450.feature b/changelog.d/7450.feature
new file mode 100644
index 0000000000..ce6140fdd1
--- /dev/null
+++ b/changelog.d/7450.feature
@@ -0,0 +1 @@
+Add support for running replication over Redis when using workers.
diff --git a/synapse/config/redis.py b/synapse/config/redis.py
index 81a27619ec..d5d3ca1c9e 100644
--- a/synapse/config/redis.py
+++ b/synapse/config/redis.py
@@ -31,5 +31,4 @@ class RedisConfig(Config):
self.redis_host = redis_config.get("host", "localhost")
self.redis_port = redis_config.get("port", 6379)
- self.redis_dbid = redis_config.get("dbid")
self.redis_password = redis_config.get("password")
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,
)
|
