Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't close prematurely..

This commit is contained in:
Erik Johnston 2017-10-12 17:57:31 +01:00
parent cc505b4b5e
commit 4ae85ae121
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/rest/media/v1/media_repository.py
View File

@ -97,12 +97,13 @@ class MediaRepository(object):
os.makedirs(dirname)
@staticmethod
def _write_file_synchronously(source, fname):
def _write_file_synchronously(source, fname, close_source=False):
source.seek(0) # Ensure we read from the start of the file
with open(fname, "wb") as f:
shutil.copyfileobj(source, f)
source.close()
if close_source:
source.close()
@defer.inlineCallbacks
def write_to_file(self, source, path):
@ -148,10 +149,12 @@ class MediaRepository(object):
yield preserve_context_over_fn(
threads.deferToThread,
self._write_file_synchronously, source, backup_fname,
close_source=True,
)
else:
preserve_fn(threads.deferToThread)(
self._write_file_synchronously, source, backup_fname,
close_source=True,
)
else:
source.close()