summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-09 13:07:29 +0100
committerGitHub <noreply@github.com>2017-06-09 13:07:29 +0100
commitbfd68019c23104998d0b4ae4a866e977dbfda1b0 (patch)
tree409c52a3c6391d06eaf046394787d217a6b9c835
parentMerge pull request #2265 from matrix-org/erikj/remote_leave_outlier (diff)
parentAdd missing notifier (diff)
downloadsynapse-bfd68019c23104998d0b4ae4a866e977dbfda1b0.tar.xz
Merge pull request #2267 from matrix-org/erikj/missing_notifier
Fix removing of pushers when using workers
-rw-r--r--synapse/replication/tcp/resource.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py

index 8b2c4c3043..69c46911ec 100644 --- a/synapse/replication/tcp/resource.py +++ b/synapse/replication/tcp/resource.py
@@ -67,6 +67,7 @@ class ReplicationStreamer(object): self.store = hs.get_datastore() self.presence_handler = hs.get_presence_handler() self.clock = hs.get_clock() + self.notifier = hs.get_notifier() # Current connections. self.connections = [] @@ -99,7 +100,7 @@ class ReplicationStreamer(object): if not hs.config.send_federation: self.federation_sender = hs.get_federation_sender() - hs.get_notifier().add_replication_callback(self.on_notifier_poke) + self.notifier.add_replication_callback(self.on_notifier_poke) # Keeps track of whether we are currently checking for updates self.is_looping = False