diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-10-22 20:19:40 +0200 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-10-22 20:19:40 +0200 |
| commit | c7503f8f335bda84a2c40b659a409df05538868d (patch) | |
| tree | 8844135554b54605a14287f63a5fe5a0959b0ad8 /synapse/app/pusher.py | |
| parent | fix missing import and run isort (diff) | |
| parent | Use recaptcha_ajax.js directly from Google (diff) | |
| download | synapse-c7503f8f335bda84a2c40b659a409df05538868d.tar.xz | |
merge in master
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 9295a51d5b..a4fc7e91fa 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -148,8 +148,9 @@ class PusherReplicationHandler(ReplicationClientHandler): self.pusher_pool = hs.get_pusherpool() + @defer.inlineCallbacks def on_rdata(self, stream_name, token, rows): - super(PusherReplicationHandler, self).on_rdata(stream_name, token, rows) + yield super(PusherReplicationHandler, self).on_rdata(stream_name, token, rows) run_in_background(self.poke_pushers, stream_name, token, rows) @defer.inlineCallbacks @@ -162,11 +163,11 @@ class PusherReplicationHandler(ReplicationClientHandler): else: yield self.start_pusher(row.user_id, row.app_id, row.pushkey) elif stream_name == "events": - yield self.pusher_pool.on_new_notifications( + self.pusher_pool.on_new_notifications( token, token, ) elif stream_name == "receipts": - yield self.pusher_pool.on_new_receipts( + self.pusher_pool.on_new_receipts( token, token, set(row.room_id for row in rows) ) except Exception: |