From 9474523addb78d3b16a72949c6d85c4059fffa92 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 3 Aug 2024 12:12:42 -0700 Subject: [PATCH] Revert "uploader.py: simplify clear_locks by using rglob (#32974)" This reverts commit cafca4f89176855585835ff7c67dea5a9b08ca23. --- system/loggerd/uploader.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/system/loggerd/uploader.py b/system/loggerd/uploader.py index 4a95997e60..965d74bef8 100755 --- a/system/loggerd/uploader.py +++ b/system/loggerd/uploader.py @@ -19,7 +19,6 @@ from openpilot.common.realtime import set_core_affinity from openpilot.system.hardware.hw import Paths from openpilot.system.loggerd.xattr_cache import getxattr, setxattr from openpilot.common.swaglog import cloudlog -from pathlib import Path NetworkType = log.DeviceState.NetworkType UPLOAD_ATTR_NAME = 'user.upload' @@ -62,9 +61,12 @@ def listdir_by_creation(d: str) -> list[str]: return [] def clear_locks(root: str) -> None: - for lock_file in Path(root).rglob('*.lock'): + for logdir in os.listdir(root): + path = os.path.join(root, logdir) try: - lock_file.unlink() + for fname in os.listdir(path): + if fname.endswith(".lock"): + os.unlink(os.path.join(path, fname)) except OSError: cloudlog.exception("clear_locks failed")