diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-05-07 16:46:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 16:46:15 +0100 |
| commit | da9b2db3af55f8508689f5c5d3aab67c01a3edbd (patch) | |
| tree | 03042633b59d352a36e4292a7b32460085da2d07 | |
| parent | Add a configuration setting for the dummy event threshold (#7422) (diff) | |
| download | synapse-da9b2db3af55f8508689f5c5d3aab67c01a3edbd.tar.xz | |
Drop support for redis.dbid (#7450)
Since we only use pubsub, the dbid is irrelevant.
| -rw-r--r-- | changelog.d/7450.feature | 1 | ||||
| -rw-r--r-- | synapse/config/redis.py | 1 | ||||
| -rw-r--r-- | synapse/replication/tcp/handler.py | 4 |
3 files changed, 2 insertions, 4 deletions
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, ) |