Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-11 20:26:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3140 from matrix-org/rav/use_run_in_background

Browse source 
Use run_in_background in preference to preserve_fn
This commit is contained in:
Richard van der Hoff 2018-04-30 00:34:28 +01:00 • committed by GitHub
commit aab2e4da60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 98 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/rest/media/v1/preview_url_resource.py
View file

@ -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(