diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-22 17:06:10 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-22 17:06:10 +0100 |
| commit | fd2dbf183676804cb6925972e67969c51c1a4074 (patch) | |
| tree | 9a9344671dc650b85a5bd42b0fb9d6649ae0834f /synapse/handlers/message.py | |
| parent | Update notice format (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-fd2dbf183676804cb6925972e67969c51c1a4074.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 4d006df63c..e484061cc0 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -778,11 +778,8 @@ class EventCreationHandler(object): event, context=context ) - # this intentionally does not yield: we don't care about the result - # and don't need to wait for it. - run_in_background( - self.pusher_pool.on_new_notifications, - event_stream_id, max_stream_id + self.pusher_pool.on_new_notifications( + event_stream_id, max_stream_id, ) def _notify(): |