diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-07-04 00:07:04 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 00:07:04 +1000 |
| commit | 463b072b1290a8cb75bc1d7b6688fa76bbfdb14f (patch) | |
| tree | b3b3f1807e74ff1aa23f48384c4d64a165975131 /synapse/rest/media/v1/_base.py | |
| parent | Fix 'utime went backwards' errors on daemonization. (#5609) (diff) | |
| download | synapse-463b072b1290a8cb75bc1d7b6688fa76bbfdb14f.tar.xz | |
Move logging utilities out of the side drawer of util/ and into logging/ (#5606)
Diffstat (limited to 'synapse/rest/media/v1/_base.py')
| -rw-r--r-- | synapse/rest/media/v1/_base.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py index 3318638d3e..5fefee4dde 100644 --- a/synapse/rest/media/v1/_base.py +++ b/synapse/rest/media/v1/_base.py @@ -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: |