projects/tentacles/src/python/tentacles/workers.py

@@ -80,7 +80,7 @@ def poll_printers(app: App, db: Db) -> None:
             ):
                 return True  # Assume the bed is ready
 
-            status: dict = client._post(
+            status = client._post(
                 "/api/plugin/bedready",
                 json={
                     "command": "check_bed",
@@ -114,8 +114,6 @@ def poll_printers(app: App, db: Db) -> None:
 
             elif printer_state.get("printing"):
                 _set_status("running")
-                if mapped_job:
-                    db.start_job(jid=mapped_job.id)
 
             elif printer_job.get("state").lower() == "connecting":
                 _set_status("connecting")
@@ -225,6 +223,7 @@ def revoke_jobs(app: App, db: Db) -> None:
         if job.printer_id:
             printer = db.fetch_printer(pid=job.printer_id)
 
+            try:
                 log.info(f"Cancelling running job {job.id}")
                 client = get_client(printer.url, printer.api_key)
                 try:
@@ -238,6 +237,12 @@ def revoke_jobs(app: App, db: Db) -> None:
                 log.info(f"Job {job.id} -> cancelled")
                 db.finish_job(jid=job.id, state="cancelled")
 
+            except TimeoutError:
+                pass
+
+            except Exception:
+                log.exception("Oop")
+
         else:
             log.info(f"Unmapped job {job.id} became cancelled")
             db.finish_job(jid=job.id, state="cancelled")
@@ -248,6 +253,7 @@ def pull_jobs(app: App, db: Db) -> None:
 
     for job in db.list_running_jobs():
         printer = db.fetch_printer(pid=job.printer_id)
+        try:
             client = get_client(printer.url, printer.api_key)
             job_state = client.job_info()
             try:
@@ -276,6 +282,12 @@ def pull_jobs(app: App, db: Db) -> None:
                 )
                 db.finish_job(jid=job.id, state="failed")
 
+        except TimeoutError:
+            pass
+
+        except Exception:
+            log.exception("Oop")
+
 
 def send_emails(app, db: Db):
     with closing(
@@ -381,8 +393,5 @@ class Worker(Monitor):
         )
 
     def callback(self):
-        try:
         with closing(self._db_factory(self._app)) as db:
             self._callback(self._app, db)
-        except:
-            log.exception("Worker tick failed; exception swallowed")