OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2566 from matrix-org/rav/media_logcontext_leak 

Fix a logcontext leak in the media repo
pull/2074/merge
Richard van der Hoff 2017-10-23 14:47:49 +01:00 committed by GitHub
parent 3267b81b81 d03cfc4258
commit ecf198aab8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/rest/media/v1/_base.py
View File

@ -17,6 +17,7 @@ from synapse.http.server import respond_with_json, finish_request
from synapse.api.errors import ( from synapse.api.errors import (
cs_error, Codes, SynapseError cs_error, Codes, SynapseError
) )
from synapse.util import logcontext
from twisted.internet import defer from twisted.internet import defer
from twisted.protocols.basic import FileSender 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: with open(file_path, "rb") as f:
yield FileSender().beginFileTransfer(f, request) yield logcontext.make_deferred_yieldable(
FileSender().beginFileTransfer(f, request)
)
finish_request(request) finish_request(request)
else: else: