mirror of
https://mau.dev/maunium/synapse.git
synced 2024-10-03 15:09:12 +02:00
Merge pull request #2566 from matrix-org/rav/media_logcontext_leak
Fix a logcontext leak in the media repo
This commit is contained in:
commit
ecf198aab8
1 changed files with 4 additions and 1 deletions
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue