error handling

Author: roDEV0

requirements.txt

@@ -33,4 +33,5 @@ yarl==1.23.0
 
 apscheduler
 scipy
-matplotlib
+matplotlib
+tenacity

watcher/jobs/objective.py

@@ -171,17 +171,26 @@ async def check_sessions(requester, tracker):
             print(f"Error in check_sessions: {e}")
             traceback.print_exc()
 
+def format_uuid(uuid: str) -> str:
+    if "-" in uuid:
+        return uuid
+    return f"{uuid[:8]}-{uuid[8:12]}-{uuid[12:16]}-{uuid[16:20]}-{uuid[20:]}"
+
+async def append_position(player: str, position: tuple, tracker):
+    try:
+        if player in tracker.sessions:
+            if position is None:
+                await tracker.sessions[player].append_position([None, None, None])
+            else:
+                await tracker.sessions[player].append_position(position)
+    except Exception as e:
+        print(f"Error in append_position: {e}")
+
 async def get_positions(requester, tracker):
     print("Getting positions...")
     online_data = await requester.map_request()
 
-    def format_uuid(uuid: str) -> str:
-        return f"{uuid[:8]}-{uuid[8:12]}-{uuid[12:16]}-{uuid[16:20]}-{uuid[20:]}"
-
-    tasks = [
-        tracker.sessions[format_uuid(player["uuid"])].append_position((player["x"], player["y"], player["z"]) if (format_uuid(player["uuid"])) in tracker.sessions else [None, None, None])
-        for player in online_data["players"]
-    ]
+    tasks = [append_position(format_uuid(player["uuid"]), (player["x"], player["y"], player["z"]), tracker) for player in online_data["players"]]
 
     await asyncio.gather(*tasks)
 

watcher/jobs/snapshots.py

@@ -4,6 +4,7 @@ async def take_player_snapshot():
     snapshot_objects = []
     print("Taking player snapshots...")
     for player in await Players.all():
+
         sessions = await Sessions.filter(player=player.id)
 
         player_town = await Towns.filter(id=player.town).first()

watcher/main.py

@@ -1,14 +1,17 @@
+import asyncio
+import os
+
+import aiohttp
+from apscheduler.events import EVENT_JOB_ERROR
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from tortoise import Tortoise
-import aiohttp
-import os
-from shared.http_requests import HTTPRequester
-from watcher.jobs.objective import check_sessions, get_positions, update_map, check_town_blocks, clean_dead_sessions
-import asyncio
+
 from shared.database import Active
+from shared.http_requests import HTTPRequester
 from watcher.jobs.objective import Session
+from watcher.jobs.objective import check_sessions, get_positions, update_map, check_town_blocks, clean_dead_sessions
 from watcher.jobs.snapshots import take_player_snapshot, take_town_snapshot
-from apscheduler.events import EVENT_JOB_ERROR
+from tenacity import retry, stop_after_attempt, wait_exponential
 
 scheduler = AsyncIOScheduler()
 
@@ -22,6 +25,12 @@ async def load_sessions(tracker):
         tracker.sessions[session.player] = await Session.load(session)
     print(f"Loaded {len(active_sessions)} active sessions")
 
+@retry(stop=stop_after_attempt(3), wait=wait_exponential(multiplier=1, min=1, max=60))
+async def attempt_connection(url):
+    await Tortoise.init(db_url=url, modules={"models": ["shared.database"]})
+    print("DB initialized successfully")
+    return 0
+
 async def main():
     await Tortoise.close_connections()
 
@@ -32,8 +41,7 @@ async def main():
 
     tracker = Tracker()
 
-    await Tortoise.init(db_url=database_url, modules={"models": ["shared.database"]})
-    print("DB initialized successfully")
+    await attempt_connection(database_url)
 
     scheduler.add_job(
         check_sessions, "interval", minutes=5,