diff options
| author | Erik Johnston <erik@matrix.org> | 2020-05-04 14:04:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 14:04:09 +0100 |
| commit | 350421e0589606f422df22d9901330776fa5ed5f (patch) | |
| tree | a66d335cb0b76af298b9c0e93d036f718b8c8bf5 /synapse/replication/tcp | |
| parent | Convert synapse.server_notices to async/await. (#7394) (diff) | |
| download | synapse-350421e0589606f422df22d9901330776fa5ed5f.tar.xz | |
Fix redis password support. (#7401)
We forgot to set the password on the subscriber connection, as well as not calling super methods for overridden connectionMade/connectionLost functions.
Diffstat (limited to 'synapse/replication/tcp')
| -rw-r--r-- | synapse/replication/tcp/redis.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/replication/tcp/redis.py b/synapse/replication/tcp/redis.py index 617e860f95..41c623d737 100644 --- a/synapse/replication/tcp/redis.py +++ b/synapse/replication/tcp/redis.py @@ -61,6 +61,7 @@ class RedisSubscriber(txredisapi.SubscriberProtocol, AbstractConnection): outbound_redis_connection = None # type: txredisapi.RedisProtocol def connectionMade(self): + super().connectionMade() logger.info("Connected to redis instance") self.subscribe(self.stream_name) self.send_command(ReplicateCommand()) @@ -119,6 +120,7 @@ class RedisSubscriber(txredisapi.SubscriberProtocol, AbstractConnection): logger.warning("Unhandled command: %r", cmd) def connectionLost(self, reason): + super().connectionLost(reason) logger.info("Lost connection to redis instance") self.handler.lost_connection(self) @@ -189,5 +191,6 @@ class RedisDirectTcpReplicationClientFactory(txredisapi.SubscriberFactory): p.handler = self.handler p.outbound_redis_connection = self.outbound_redis_connection p.stream_name = self.stream_name + p.password = self.password return p |