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

Fix logcontext leak in media repo
matrix-org · May 2, 2018 · 5a0be97 · 5a0be97
2 parents 4e9bdeb + be31adb
commit 5a0be97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py
@@ -143,6 +143,7 @@ def respond_with_responder(request, responder, media_type, file_size, upload_nam
         respond_404(request)
         return
 
+    logger.debug("Responding to media request with responder %s")
     add_file_headers(request, media_type, file_size, upload_name)
     with responder:
         yield responder.write_to_consumer(request)

diff --git a/synapse/rest/media/v1/media_storage.py b/synapse/rest/media/v1/media_storage.py
@@ -255,7 +255,9 @@ def __init__(self, open_file):
         self.open_file = open_file
 
     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):
         self.open_file.close()