diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-22 16:12:11 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-22 16:12:11 +0100 |
| commit | e7a16c6210191e9556fb1c11cbff2d98f0a5206c (patch) | |
| tree | 306f39afc6b054f22d04076278c44153865d8e08 /synapse/push/httppusher.py | |
| parent | Give pushers their own background logcontext (diff) | |
| download | synapse-e7a16c6210191e9556fb1c11cbff2d98f0a5206c.tar.xz | |
Remove redundant run_as_background_process() from pusherpool
`on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough.
Diffstat (limited to 'synapse/push/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 5f6b21bc67..770f55feae 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -98,7 +98,6 @@ class HttpPusher(object): def on_new_notifications(self, min_stream_ordering, max_stream_ordering): self.max_stream_ordering = max(max_stream_ordering, self.max_stream_ordering or 0) self._start_processing() - return defer.suceed(None) def on_new_receipts(self, min_stream_id, max_stream_id): # Note that the min here shouldn't be relied upon to be accurate. @@ -106,7 +105,6 @@ class HttpPusher(object): # We could check the receipts are actually m.read receipts here, # but currently that's the only type of receipt anyway... run_as_background_process("http_pusher.on_new_receipts", self._update_badge) - return defer.succeed(None) @defer.inlineCallbacks def _update_badge(self): |