Skip to content

Commit 6159b4d

Browse files
richvdhphil-flex
authored andcommitted
Drop support for redis.dbid (matrix-org#7450)
Since we only use pubsub, the dbid is irrelevant.
1 parent 0399642 commit 6159b4d

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

changelog.d/7450.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for running replication over Redis when using workers.

synapse/config/redis.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ def read_config(self, config, **kwargs):
3131

3232
self.redis_host = redis_config.get("host", "localhost")
3333
self.redis_port = redis_config.get("port", 6379)
34-
self.redis_dbid = redis_config.get("dbid")
3534
self.redis_password = redis_config.get("password")

synapse/replication/tcp/handler.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,9 @@ def start_replication(self, hs):
131131
import txredisapi
132132

133133
logger.info(
134-
"Connecting to redis (host=%r port=%r DBID=%r)",
134+
"Connecting to redis (host=%r port=%r)",
135135
hs.config.redis_host,
136136
hs.config.redis_port,
137-
hs.config.redis_dbid,
138137
)
139138

140139
# We need two connections to redis, one for the subscription stream and
@@ -145,7 +144,6 @@ def start_replication(self, hs):
145144
outbound_redis_connection = txredisapi.lazyConnection(
146145
host=hs.config.redis_host,
147146
port=hs.config.redis_port,
148-
dbid=hs.config.redis_dbid,
149147
password=hs.config.redis.redis_password,
150148
reconnect=True,
151149
)

0 commit comments

Comments
 (0)