diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-27 14:41:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-27 14:41:14 +0100 |
| commit | 1c1d67dfef59cd84baebbb24e0b9c518dc10b8ea (patch) | |
| tree | e9b9c9abb78e3b2019adb064de6fb47fe02871c6 /synapse/rest | |
| parent | Add note about updating your signing keys (ie. "the auto thing") (diff) | |
| parent | Fix newlines (diff) | |
| download | synapse-1c1d67dfef59cd84baebbb24e0b9c518dc10b8ea.tar.xz | |
Merge pull request #132 from matrix-org/observer_and_locks
Observer and locks
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/base_resource.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/base_resource.py b/synapse/rest/media/v1/base_resource.py index edd4f78024..08c8d75af4 100644 --- a/synapse/rest/media/v1/base_resource.py +++ b/synapse/rest/media/v1/base_resource.py @@ -25,6 +25,8 @@ from twisted.internet import defer from twisted.web.resource import Resource from twisted.protocols.basic import FileSender +from synapse.util.async import create_observer + import os import logging @@ -87,7 +89,7 @@ class BaseMediaResource(Resource): def callback(media_info): del self.downloads[key] return media_info - return download + return create_observer(download) @defer.inlineCallbacks def _get_remote_media_impl(self, server_name, media_id): |