diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 00:34:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 00:34:28 +0100 |
| commit | aab2e4da60a11de3d84e9a603077cc43386db1f4 (patch) | |
| tree | f3b6b59408b7ca4cd16925ff7f1f50785032872b /synapse/app/federation_sender.py | |
| parent | Merge pull request #3156 from NotAFile/py3-hmac-bytes (diff) | |
| parent | pep8; remove spurious import (diff) | |
| download | synapse-aab2e4da60a11de3d84e9a603077cc43386db1f4.tar.xz | |
Merge pull request #3140 from matrix-org/rav/use_run_in_background
Use run_in_background in preference to preserve_fn
Diffstat (limited to 'synapse/app/federation_sender.py')
| -rw-r--r-- | synapse/app/federation_sender.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py index 4f2a9ca21a..a08af83a4c 100644 --- a/synapse/app/federation_sender.py +++ b/synapse/app/federation_sender.py @@ -38,7 +38,7 @@ from synapse.server import HomeServer from synapse.storage.engines import create_engine from synapse.util.async import Linearizer from synapse.util.httpresourcetree import create_resource_tree -from synapse.util.logcontext import LoggingContext, preserve_fn +from synapse.util.logcontext import LoggingContext, run_in_background from synapse.util.manhole import manhole from synapse.util.versionstring import get_version_string from twisted.internet import defer, reactor @@ -229,7 +229,7 @@ class FederationSenderHandler(object): # presence, typing, etc. if stream_name == "federation": send_queue.process_rows_for_federation(self.federation_sender, rows) - preserve_fn(self.update_token)(token) + run_in_background(self.update_token, token) # We also need to poke the federation sender when new events happen elif stream_name == "events": |