diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-05-04 16:33:56 +0200 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-05-04 16:33:56 +0200 |
| commit | 15aa09bbe661eca31c7dc326703098c2c74e7a7a (patch) | |
| tree | 86955d167a59b0a55b6a9ebad821031d6e9cc0e5 /synapse | |
| parent | Convert the room handler to async/await. (#7396) (diff) | |
| parent | Fix ordering in MANIFEST.in (diff) | |
| download | synapse-15aa09bbe661eca31c7dc326703098c2c74e7a7a.tar.xz | |
Merge branch 'release-v1.13.0' into develop
Diffstat (limited to 'synapse')
| -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 |