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

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

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