diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-24 09:53:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 09:53:57 +0100 |
| commit | e0b9d5f0aff02681e0af59c9866d3ee74994bb2c (patch) | |
| tree | e3f4d728e70f301ad0f989d35b463043f5ba06c6 /synapse/app/pusher.py | |
| parent | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation (diff) | |
| parent | Fix start_pushers vs _start_pushers confusion (diff) | |
| download | synapse-e0b9d5f0aff02681e0af59c9866d3ee74994bb2c.tar.xz | |
Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts
Clean up the way logcontexts and threads work in the pushers
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): |