OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Drop support for redis.dbid (#7450) 

Since we only use pubsub, the dbid is irrelevant.
pull/7489/head
Richard van der Hoff 2020-05-07 16:46:15 +01:00 committed by GitHub
parent d9b8d27494
commit da9b2db3af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7450.feature Normal file
View File

@ -0,0 +1 @@
Add support for running replication over Redis when using workers.

1
synapse/config/redis.py
View File

@ -31,5 +31,4 @@ class RedisConfig(Config):
self.redis_host = redis_config.get("host", "localhost") self.redis_host = redis_config.get("host", "localhost")
self.redis_port = redis_config.get("port", 6379) self.redis_port = redis_config.get("port", 6379)
self.redis_dbid = redis_config.get("dbid")
self.redis_password = redis_config.get("password") self.redis_password = redis_config.get("password")

4
synapse/replication/tcp/handler.py
View File

@ -131,10 +131,9 @@ class ReplicationCommandHandler:
import txredisapi import txredisapi
logger.info( 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_host,
hs.config.redis_port, hs.config.redis_port,
hs.config.redis_dbid,
) )
# We need two connections to redis, one for the subscription stream and # We need two connections to redis, one for the subscription stream and
@ -145,7 +144,6 @@ class ReplicationCommandHandler:
outbound_redis_connection = txredisapi.lazyConnection( outbound_redis_connection = txredisapi.lazyConnection(
host=hs.config.redis_host, host=hs.config.redis_host,
port=hs.config.redis_port, port=hs.config.redis_port,
dbid=hs.config.redis_dbid,
password=hs.config.redis.redis_password, password=hs.config.redis.redis_password,
reconnect=True, reconnect=True,
) )