diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-10-23 14:34:27 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-10-23 14:34:27 +0100 |
| commit | d03cfc4258d7a9578b454db2a35d18772dfdcdbf (patch) | |
| tree | bf368666ffc97ac2978f769ed158559d03b8332f /synapse | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-d03cfc4258d7a9578b454db2a35d18772dfdcdbf.tar.xz | |
Fix a logcontext leak in the media repo
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/media/v1/_base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py index b9600f2167..bce077becf 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 @@ -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: |