diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 11:29:27 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:55:51 +0100 |
| commit | 2a13af23bc0561ab48e0a90528231c40ee209724 (patch) | |
| tree | 55b806d5723d009cee8c9e925530dc5cedb1c37a /synapse/rest | |
| parent | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff) | |
| download | synapse-2a13af23bc0561ab48e0a90528231c40ee209724.tar.xz | |
Use run_in_background in preference to preserve_fn
While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object.
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 0fc21540c6..9290d7946f 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -35,7 +35,7 @@ from ._base import FileInfo from synapse.api.errors import ( SynapseError, Codes, ) -from synapse.util.logcontext import preserve_fn, make_deferred_yieldable +from synapse.util.logcontext import make_deferred_yieldable, run_in_background from synapse.util.stringutils import random_string from synapse.util.caches.expiringcache import ExpiringCache from synapse.http.client import SpiderHttpClient @@ -144,7 +144,8 @@ class PreviewUrlResource(Resource): observable = self._cache.get(url) if not observable: - download = preserve_fn(self._do_preview)( + download = run_in_background( + self._do_preview, url, requester.user, ts, ) observable = ObservableDeferred( |