Merge pull request #16 from bemble/fix_worker

catch worker exceptions

Author: bemble

front/src/i18n/en.json

@@ -66,6 +66,7 @@
     "title": "Status",
     "websocket": "Websocket",
     "app_version": "Application version: ",
+    "worker_last_run": "Worker last run",
     "debrider": "Debrider",
     "downloader": "Downloader",
     "restart": "Restart",

front/src/i18n/fr.json

@@ -65,6 +65,7 @@
     "title": "États",
     "websocket": "Websocket",
     "app_version": "Version de l'application : ",
+    "worker_last_run": "Dernière exécution du worker :",
     "debrider": "Débrideur",
     "downloader": "Téléchargeur",
     "restart": "Redémarrer",

front/src/models/status.type.ts

@@ -1,6 +1,9 @@
 export type Status = {
   app: {
     version: string;
+    worker: {
+      last_run: string;
+    };
   };
   debrider: {
     id: string;

front/src/pages/Status/Status.tsx

@@ -52,6 +52,20 @@ const Status = () => {
                     {isLoading ? t("loading") : status?.app.version}
                   </code>
                 </div>
+                <div>
+                  {t("status.worker_last_run")}{" "}
+                  <code
+                    className={classNames(classes.code, {
+                      [classes.pending]: isLoading,
+                    })}
+                  >
+                    {isLoading
+                      ? t("loading")
+                      : new Date(
+                          status?.app.worker.last_run as any
+                        ).toLocaleString()}
+                  </code>
+                </div>
                 <div className={classes.spacer} />
                 <hr className={classes.separator} />
                 <div className={classes.spacer} />

server/holerr/api/routers/routers_models.py

@@ -78,8 +78,12 @@ class StatusElement(BaseModel):
     name: str
     connected: bool
 
+class WorkerElement(BaseModel):
+    last_run: datetime | None
+
 class StatusApp(BaseModel):
     version: str
+    worker: WorkerElement
 
 class Status(BaseModel):
     app: StatusApp

server/holerr/api/routers/status.py

@@ -2,6 +2,7 @@
 from holerr.downloaders import downloader
 from .routers_models import Status
 from holerr.utils import info
+from holerr.tasks import worker
 
 from fastapi import APIRouter
 
@@ -13,6 +14,9 @@ async def get_status():
     return {
         "app": {
             "version": info.get_app_version(),
+            "worker": {
+                "last_run": worker.last_run,
+            }
         },
         "debrider": {
             "id": debrider.get_id(),

server/holerr/tasks/worker.py

@@ -3,13 +3,15 @@
 
 import asyncio
 import threading
+from datetime import datetime
 
 log = Log.get_logger(__name__)
 
 
 class Worker:
     _worker: threading.Thread = None
     _tasks: list[Task] = []
+    last_run: datetime = None
 
     def add(self, task: Task):
         log.debug(type(task).__name__ + " added")
@@ -35,5 +37,9 @@ async def _run(self):
         log.debug("Starting workers")
         while True:
             for task in self._tasks:
-                await task.run()
+                try:
+                    await task.run()
+                except Exception as e:
+                    log.error(f"Error while running task, {e}")
+                self.last_run = datetime.now()
             await asyncio.sleep(5)

server/requirements.txt

@@ -25,6 +25,7 @@ SQLAlchemy==2.0.29
 starlette==0.37.2
 torf==4.2.6
 typing_extensions==4.11.0
+tzdata==2024.1
 urllib3==2.2.1
 uvicorn==0.29.0
 uvloop==0.19.0