* fixed cleanup

Author: White4Shadow

checker/src/checker.py

@@ -3,6 +3,7 @@
 import random
 import string
 from logging import LoggerAdapter
+import time
 
 import aiofiles
 import aiofiles.tempfile
@@ -188,9 +189,9 @@ async def upload_image(self, token, flag):
                 raise MumbleException(f"Failed to upload image (status={resp.status_code})")
             return resp.json()
         finally:
-            await loop.run_in_executor(None, safe_unlink, flagfile_path)
+            await loop.run_in_executor(None, safe_unlink, flagfile_path, self.logger)
             if await loop.run_in_executor(None, os.path.exists, steghide_img_path):
-                await loop.run_in_executor(None, safe_unlink, steghide_img_path)
+                await loop.run_in_executor(None, safe_unlink, steghide_img_path, self.logger)
 
     async def get_image(self, filename, token):
         self.logger.info(f"[get_image_p] /images/{filename} token={token}...")
@@ -235,8 +236,8 @@ async def extract_flag_from_image(self, image_path):
             return extracted_flag.strip()
 
         finally:
-            await safe_unlink(flagfile_path)
-            await safe_unlink(image_path)
+            await loop.run_in_executor(None, safe_unlink, flagfile_path, self.logger)
+            await loop.run_in_executor(None, safe_unlink, image_path, self.logger)
 
 
 #########################################
@@ -246,15 +247,17 @@ async def extract_flag_from_image(self, image_path):
 def rand_str(n):
     return "".join(random.choices(ALPHABET, k=n))
 
-
-async def safe_unlink(path):
+def safe_unlink(path, logger):
     for _ in range(3):
         try:
             if os.path.exists(path):
                 os.unlink(path)
                 return
-        except Exception:
-            await asyncio.sleep(0.1)
+        except Exception as e:
+            logger.warning(f"safe_unlink: Failed to delete {path}: {e}")
+            time.sleep(0.1)
+    if os.path.exists(path):
+        logger.error(f"safe_unlink: Giving up, {path} could not be deleted after 3 tries.")
 
 def username_normalform(username):
     letters = sorted([c for c in username if c.isalpha()])

service/backend/main.py

@@ -591,7 +591,6 @@ async def cleanup_old_records():
     user upload folders asynchronously.
     """
     while True:
-        await asyncio.sleep(240)
         db_gen = get_async_db()
         db = await anext(db_gen)
         try:
@@ -677,7 +676,7 @@ async def cleanup_old_records():
         finally:
             await db_gen.aclose()
 
-
+        await asyncio.sleep(240)
 
 @app.post("/images/upload", status_code=status.HTTP_201_CREATED)
 async def upload_dungeon_image(file: UploadFile = File(...),