mirror_maker/synapse-s3-storage-provider
1
0
Fork 1
mirror of https://github.com/matrix-org/synapse-s3-storage-provider.git synced 2024-10-23 07:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly handle logcontexts

Browse source
This commit is contained in:
Erik Johnston 2018-02-12 13:49:43 +00:00
parent b6743e6d7b
commit c1239fbea3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
s3_storage_provider.py
View file

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