diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
| commit | 39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch) | |
| tree | 8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/rest/media/v1/_base.py | |
| parent | Correctly wire in update group profile over federation (diff) | |
| parent | Merge pull request #2568 from matrix-org/rav/pep8 (diff) | |
| download | synapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/rest/media/v1/_base.py')
| -rw-r--r-- | synapse/rest/media/v1/_base.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py index b9600f2167..95fa95fce3 100644 --- a/synapse/rest/media/v1/_base.py +++ b/synapse/rest/media/v1/_base.py @@ -17,6 +17,7 @@ from synapse.http.server import respond_with_json, finish_request from synapse.api.errors import ( cs_error, Codes, SynapseError ) +from synapse.util import logcontext from twisted.internet import defer from twisted.protocols.basic import FileSender @@ -44,7 +45,7 @@ def parse_media_id(request): except UnicodeDecodeError: pass return server_name, media_id, file_name - except: + except Exception: raise SynapseError( 404, "Invalid media id token %r" % (request.postpath,), @@ -103,7 +104,9 @@ def respond_with_file(request, media_type, file_path, ) with open(file_path, "rb") as f: - yield FileSender().beginFileTransfer(f, request) + yield logcontext.make_deferred_yieldable( + FileSender().beginFileTransfer(f, request) + ) finish_request(request) else: |