diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-25 14:40:06 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-10-25 14:40:06 +0100 |
| commit | f7f487e14c553832a0accf0dcd09b546f9b4a702 (patch) | |
| tree | f6c28616c938cedecc18b7d8326cffa175c7395c /synapse/rest/media/v1/storage_provider.py | |
| parent | isort (diff) | |
| parent | oops, run the check_isort build (diff) | |
| download | synapse-f7f487e14c553832a0accf0dcd09b546f9b4a702.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocreate_autojoin
Diffstat (limited to 'synapse/rest/media/v1/storage_provider.py')
| -rw-r--r-- | synapse/rest/media/v1/storage_provider.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/storage_provider.py b/synapse/rest/media/v1/storage_provider.py index 7b9f8b4d79..5aa03031f6 100644 --- a/synapse/rest/media/v1/storage_provider.py +++ b/synapse/rest/media/v1/storage_provider.py @@ -17,9 +17,10 @@ import logging import os import shutil -from twisted.internet import defer, threads +from twisted.internet import defer from synapse.config._base import Config +from synapse.util import logcontext from synapse.util.logcontext import run_in_background from .media_storage import FileResponder @@ -120,7 +121,8 @@ class FileStorageProviderBackend(StorageProvider): if not os.path.exists(dirname): os.makedirs(dirname) - return threads.deferToThread( + return logcontext.defer_to_thread( + self.hs.get_reactor(), shutil.copyfile, primary_fname, backup_fname, ) |