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

Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks 

Fix logcontext leak in media repo
pull/3178/head
Richard van der Hoff 2018-05-02 16:43:04 +01:00 committed by GitHub
parent 4e9bdeba57 be31adb036
commit 5a0be97ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,6 +143,7 @@ def respond_with_responder(request, responder, media_type, file_size, upload_nam
respond_404(request) respond_404(request)
return return
logger.debug("Responding to media request with responder %s")
add_file_headers(request, media_type, file_size, upload_name) add_file_headers(request, media_type, file_size, upload_name)
with responder: with responder:
yield responder.write_to_consumer(request) yield responder.write_to_consumer(request)

4
synapse/rest/media/v1/media_storage.py
View File

@ -255,7 +255,9 @@ class FileResponder(Responder):
self.open_file = open_file self.open_file = open_file
def write_to_consumer(self, consumer): def write_to_consumer(self, consumer):
return FileSender().beginFileTransfer(self.open_file, consumer) return make_deferred_yieldable(
FileSender().beginFileTransfer(self.open_file, consumer)
)
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
self.open_file.close() self.open_file.close()