diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-04-27 17:09:25 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-04-27 17:09:25 +0100 |
| commit | 38432d8c253fda453cd645491f46ef37714c4f7c (patch) | |
| tree | 76d9f0dee077b01038a939f611fbcb4b89aea496 /synapse/rest/media/v1/base_resource.py | |
| parent | Also remember to check 'invite' level for changes (diff) | |
| parent | Merge pull request #132 from matrix-org/observer_and_locks (diff) | |
| download | synapse-38432d8c253fda453cd645491f46ef37714c4f7c.tar.xz | |
Merge branch 'develop' into invite_power_level
Diffstat (limited to 'synapse/rest/media/v1/base_resource.py')
| -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): |