diff options
| author | Erik Johnston <erik@matrix.org> | 2020-09-09 16:19:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-09-09 16:19:22 +0100 |
| commit | dc9dcdbd59d4f839c7a96780f7464460fae27851 (patch) | |
| tree | 1c86319735b99474bc6a3a37b5d694d8f03f372f /synapse/handlers | |
| parent | Fixup pusher pool notifications (diff) | |
| download | synapse-dc9dcdbd59d4f839c7a96780f7464460fae27851.tar.xz | |
Revert "Fixup pusher pool notifications"
This reverts commit e7fd336a53a4ca489cdafc389b494d5477019dc0.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/message.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 74d7ac8a67..43f2986f89 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2970,7 +2970,7 @@ class FederationHandler(BaseHandler): event, event_stream_id, max_stream_id, extra_users=extra_users ) - await self.pusher_pool.on_new_notifications(max_stream_id) + await self.pusher_pool.on_new_notifications(event_stream_id, max_stream_id) async def _clean_room_for_join(self, room_id: str) -> None: """Called to clean up any data in DB for a given room, ready for the diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index d1556659e3..8a7b4916cd 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1145,7 +1145,7 @@ class EventCreationHandler: # If there's an expiry timestamp on the event, schedule its expiry. self._message_handler.maybe_schedule_expiry(event) - await self.pusher_pool.on_new_notifications(max_stream_id) + await self.pusher_pool.on_new_notifications(event_stream_id, max_stream_id) def _notify(): try: |