diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-24 13:22:59 -0600 |
| commit | 54def42c19c51b102dbd9a77dfd2430944a94d79 (patch) | |
| tree | da30431884421f42ab95e103bf66c7343d4cc4c4 /synapse/app/pusher.py | |
| parent | Fix terms UI auth test (diff) | |
| parent | fix branch regexp (diff) | |
| download | synapse-54def42c19c51b102dbd9a77dfd2430944a94d79.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 0f9f8e19f6..83b0863f00 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -161,11 +161,11 @@ class PusherReplicationHandler(ReplicationClientHandler): else: yield self.start_pusher(row.user_id, row.app_id, row.pushkey) elif stream_name == "events": - self.pusher_pool.on_new_notifications( + yield self.pusher_pool.on_new_notifications( token, token, ) elif stream_name == "receipts": - self.pusher_pool.on_new_receipts( + yield self.pusher_pool.on_new_receipts( token, token, set(row.room_id for row in rows) ) except Exception: @@ -183,7 +183,7 @@ class PusherReplicationHandler(ReplicationClientHandler): def start_pusher(self, user_id, app_id, pushkey): key = "%s:%s" % (app_id, pushkey) logger.info("Starting pusher %r / %r", user_id, key) - return self.pusher_pool._refresh_pusher(app_id, pushkey, user_id) + return self.pusher_pool.start_pusher_by_id(app_id, pushkey, user_id) def start(config_options): |