rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove race

This commit is contained in:
Erik Johnston 2016-06-29 15:24:50 +01:00
parent a70688445d
commit f52cb4cd78
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,7 +449,6 @@ class MediaRepository(object):
with (yield self.remote_media_linearizer.queue(key)): with (yield self.remote_media_linearizer.queue(key)):
full_path = self.filepaths.remote_media_filepath(origin, file_id) full_path = self.filepaths.remote_media_filepath(origin, file_id)
full_dir = os.path.dirname(full_path)
try: try:
os.remove(full_path) os.remove(full_path)
except OSError as e: except OSError as e:
@ -459,22 +458,12 @@ class MediaRepository(object):
else: else:
continue continue
try:
os.removedirs(full_dir)
except OSError:
pass
thumbnail_dir = self.filepaths.remote_media_thumbnail_dir( thumbnail_dir = self.filepaths.remote_media_thumbnail_dir(
origin, file_id origin, file_id
) )
shutil.rmtree(thumbnail_dir, ignore_errors=True) shutil.rmtree(thumbnail_dir, ignore_errors=True)
yield self.store.delete_remote_media(origin, media_id) yield self.store.delete_remote_media(origin, media_id)
try:
os.removedirs(thumbnail_dir)
except OSError:
pass
deleted += 1 deleted += 1
defer.returnValue({"deleted": deleted}) defer.returnValue({"deleted": deleted})