Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Drop support for redis.dbid #7450

Merged
merged 1 commit into from
May 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7450.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for running replication over Redis when using workers.
1 change: 0 additions & 1 deletion synapse/config/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,4 @@ def read_config(self, config, **kwargs):

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")
4 changes: 1 addition & 3 deletions synapse/replication/tcp/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,9 @@ def start_replication(self, hs):
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
Expand All @@ -145,7 +144,6 @@ def start_replication(self, hs):
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,
)
Expand Down