Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Fix empty url_cache_thumbnails/yyyy-mm-dd/ directories being left behind #10924

Merged
merged 6 commits into from
Sep 29, 2021
Merged

Fix empty url_cache_thumbnails/yyyy-mm-dd/ directories being left behind #10924

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d387b8e
Catch `FileNotFoundError`s instead of errnos in `_expire_url_cache_data`
Sep 27, 2021
ed23655
Extract 2 day expiry threshold into a constant
Sep 27, 2021
02d6f54
Fix empty `url_cache_thumbnails/yyyy-mm-dd/` directories being left b…
Sep 27, 2021
ecd5148
Add test for URL cache expiry
Sep 27, 2021
64733e9
Add newsfile
Sep 27, 2021
01492d6
Log failure to remove directories
Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Catch FileNotFoundErrors instead of errnos in _expire_url_cache_data
  • Loading branch information
Sean Quah committed Sep 27, 2021
commit d387b8eaf1d6b03d9d816eff9e6df4384e8c9151
25 changes: 12 additions & 13 deletions synapse/rest/media/v1/preview_url_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import datetime
import errno
import fnmatch
import itertools
import logging
Expand Down Expand Up @@ -504,11 +503,11 @@ async def _expire_url_cache_data(self) -> None:
fname = self.filepaths.url_cache_filepath(media_id)
try:
os.remove(fname)
except FileNotFoundError:
pass # If the path doesn't exist, meh
except OSError as e:
# If the path doesn't exist, meh
if e.errno != errno.ENOENT:
logger.warning("Failed to remove media: %r: %s", media_id, e)
continue
logger.warning("Failed to remove media: %r: %s", media_id, e)
continue

removed_media.append(media_id)

Expand Down Expand Up @@ -538,11 +537,11 @@ async def _expire_url_cache_data(self) -> None:
fname = self.filepaths.url_cache_filepath(media_id)
try:
os.remove(fname)
except FileNotFoundError:
pass # If the path doesn't exist, meh
except OSError as e:
# If the path doesn't exist, meh
if e.errno != errno.ENOENT:
logger.warning("Failed to remove media: %r: %s", media_id, e)
continue
logger.warning("Failed to remove media: %r: %s", media_id, e)
continue

try:
dirs = self.filepaths.url_cache_filepath_dirs_to_delete(media_id)
Expand All @@ -554,11 +553,11 @@ async def _expire_url_cache_data(self) -> None:
thumbnail_dir = self.filepaths.url_cache_thumbnail_directory(media_id)
try:
shutil.rmtree(thumbnail_dir)
except FileNotFoundError:
pass # If the path doesn't exist, meh
except OSError as e:
# If the path doesn't exist, meh
if e.errno != errno.ENOENT:
logger.warning("Failed to remove media: %r: %s", media_id, e)
continue
logger.warning("Failed to remove media: %r: %s", media_id, e)
continue

removed_media.append(media_id)

Expand Down