diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 01:02:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 01:02:25 +0100 |
| commit | db75c86e8463b130d4dcd84e79c1ebee616f9689 (patch) | |
| tree | b7c0c3e9262f8ca27470a0151cb5109472da20fa /synapse/handlers/message.py | |
| parent | Move more xrange to six (diff) | |
| parent | Merge pull request #3085 from NotAFile/py3-config-text-mode (diff) | |
| download | synapse-db75c86e8463b130d4dcd84e79c1ebee616f9689.tar.xz | |
Merge branch 'develop' into py3-xrange-1
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index ad932bdd90..23502eda70 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -31,7 +31,7 @@ from synapse.types import ( UserID, RoomAlias, RoomStreamToken, ) from synapse.util.async import run_on_reactor, ReadWriteLock, Limiter -from synapse.util.logcontext import preserve_fn, run_in_background +from synapse.util.logcontext import run_in_background from synapse.util.metrics import measure_func from synapse.util.frozenutils import frozendict_json_encoder from synapse.util.stringutils import random_string @@ -857,7 +857,8 @@ class EventCreationHandler(object): # this intentionally does not yield: we don't care about the result # and don't need to wait for it. - preserve_fn(self.pusher_pool.on_new_notifications)( + run_in_background( + self.pusher_pool.on_new_notifications, event_stream_id, max_stream_id ) @@ -872,7 +873,7 @@ class EventCreationHandler(object): except Exception: logger.exception("Error notifying about new room event") - preserve_fn(_notify)() + run_in_background(_notify) if event.type == EventTypes.Message: # We don't want to block sending messages on any presence code. This |