Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-07 20:22:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move logging utilities out of the side drawer of util/ and into logging/ (#5606)

Browse source
This commit is contained in:
Amber Brown 2019-07-04 00:07:04 +10:00 • committed by GitHub
parent cb8d568cf9
commit 463b072b12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 249 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/rest/media/v1/_base.py
View file

@ -25,7 +25,7 @@ from twisted.protocols.basic import FileSender
from synapse.api.errors import Codes, SynapseError, cs_error
from synapse.http.server import finish_request, respond_with_json
from synapse.util import logcontext
from synapse.logging.context import make_deferred_yieldable
from synapse.util.stringutils import is_ascii
logger = logging.getLogger(__name__)
@ -75,9 +75,7 @@ def respond_with_file(request, media_type, file_path, file_size=None, upload_nam
add_file_headers(request, media_type, file_size, upload_name)
with open(file_path, "rb") as f:
yield logcontext.make_deferred_yieldable(
FileSender().beginFileTransfer(f, request)
)
yield make_deferred_yieldable(FileSender().beginFileTransfer(f, request))
finish_request(request)
else: