From c1239fbea36db7c11130b116ccda84cc838f5382 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 12 Feb 2018 13:49:43 +0000
Subject: [PATCH] Correctly handle logcontexts

---
 s3_storage_provider.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/s3_storage_provider.py b/s3_storage_provider.py
index 50fe8ed..f430b3a 100644
--- a/s3_storage_provider.py
+++ b/s3_storage_provider.py
@@ -19,6 +19,7 @@ from twisted.python.failure import Failure
 
 from synapse.rest.media.v1.storage_provider import StorageProvider
 from synapse.rest.media.v1._base import Responder
+from synapse.util.logcontext import make_deferred_yieldable
 
 import boto3
 import botocore
@@ -51,7 +52,7 @@ class S3StorageProviderBackend(StorageProvider):
         """See StorageProvider.fetch"""
         d = defer.Deferred()
         _S3DownloadThread(self.bucket, path, d).start()
-        return d
+        return make_deferred_yieldable(d)
 
     @staticmethod
     def parse_config(config):