kryten-webqueue 0.29.0__tar.gz → 0.30.0__tar.gz

{kryten_webqueue-0.29.0 → kryten_webqueue-0.30.0}/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.30.0] — 2026-07-04
+
+### Fixed
+
+- **Clean shutdown when a catalog sync (or other job) is in progress.** Previously, shutting the server down while a background job was running caused a cascade of WARNING/ERROR log lines as the database connection and HTTP client were closed underneath the still-running job task. Three changes fix this:
+  - `JobManager` gains a `stop()` method that cancels all in-flight task and awaits them.
+  - The lifespan shutdown now calls `job_manager.stop()` *before* closing the database, HTTP clients, or any other shared resource, so the cancelled tasks can still record their final status cleanly.
+  - Background loop tasks (`bg_tasks`) are now properly awaited after cancellation, preventing "Task exception was never retrieved" warnings.
+  - `JobManager._execute` wraps every database write in a defensive `try/except` so that a race between task teardown and resource teardown never produces an unhandled exception or spurious ERROR log.
+  - `CatalogSync.sync` adds an explicit `asyncio.CancelledError` handler that logs a clean info message and re-raises (letting `JobManager` record the `cancelled` status), and wraps the error-path `finish_sync_log` calls defensively for the same reason.
+
+[0.30.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.30.0
+
 ## [0.29.0] — 2026-07-04
 
 ### Changed

{kryten_webqueue-0.29.0 → kryten_webqueue-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryten-webqueue
-Version: 0.29.0
+Version: 0.30.0
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT

{kryten_webqueue-0.29.0 → kryten_webqueue-0.30.0}/kryten_webqueue/app.py

@@ -227,9 +227,11 @@ async def lifespan(app: FastAPI):
 
     yield
 
-    # Shutdown
+    # Shutdown — order matters: cancel in-flight work before closing resources.
     for task in bg_tasks:
         task.cancel()
+    await asyncio.gather(*bg_tasks, return_exceptions=True)
+    await job_manager.stop()  # cancel running jobs while DB/client still open
     await poller.stop()
     await race_poller.stop()
     await scheduler.stop()

{kryten_webqueue-0.29.0 → kryten_webqueue-0.30.0}/kryten_webqueue/catalog/sync.py

@@ -96,14 +96,25 @@ class CatalogSync:
 
             await self._db.finish_sync_log(log_id, stats, "completed")
             logger.info(f"Catalog sync complete: {stats} ({page} pages)")
+        except asyncio.CancelledError:
+            # Server is shutting down — propagate cleanly so JobManager can
+            # record the cancelled status while the DB is still open.
+            logger.info("Catalog sync cancelled (shutdown in progress)")
+            raise
         except httpx.TransportError as exc:
             logger.error(_describe_httpx_error(exc, f"{self._url}/api/v1/media"))
             stats["errors"] += 1
-            await self._db.finish_sync_log(log_id, stats, "error")
+            try:
+                await self._db.finish_sync_log(log_id, stats, "error")
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist sync error status (DB unavailable)")
         except Exception as exc:
             logger.exception(f"Catalog sync failed: {type(exc).__name__}: {exc}")
             stats["errors"] += 1
-            await self._db.finish_sync_log(log_id, stats, "error")
+            try:
+                await self._db.finish_sync_log(log_id, stats, "error")
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist sync error status (DB unavailable)")
 
     async def _process_item(self, media: dict, stats: dict):
         token = media.get("friendly_token")

{kryten_webqueue-0.29.0 → kryten_webqueue-0.30.0}/kryten_webqueue/jobs/manager.py

@@ -158,6 +158,20 @@ class JobManager:
     def is_running(self, name: str) -> bool:
         return name in self._running
 
+    async def stop(self) -> None:
+        """Cancel all running job tasks and wait for them to finish.
+
+        Call this during application shutdown *before* closing shared resources
+        (database, HTTP clients) so that in-progress tasks receive
+        ``CancelledError`` while those resources are still usable.
+        """
+        if not self._running:
+            return
+        logger.info("Stopping %d running job(s) for shutdown", len(self._running))
+        for task in list(self._running.values()):
+            task.cancel()
+        await asyncio.gather(*self._running.values(), return_exceptions=True)
+
     async def run(self, name: str, *, triggered_by: str | None = None,
                   params: dict | None = None) -> dict:
         """Start a job in the background. Returns immediately.
@@ -191,19 +205,28 @@ class JobManager:
             detail = json.dumps(result) if result is not None else None
             await self._db.finish_job_run(run_id, "completed", detail)
         except asyncio.CancelledError:
-            await self._db.finish_job_run(run_id, "cancelled", None)
+            try:
+                await self._db.finish_job_run(run_id, "cancelled", None)
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist 'cancelled' status for job '%s' (DB unavailable)", name)
             raise
         except JobError as exc:
             # Expected, user-facing failure (bad input/config): record a clean
             # message and log without a stack trace.
             logger.warning("Job '%s' failed: %s", name, exc)
-            await self._db.finish_job_run(
-                run_id, "failed", json.dumps({"error": str(exc)})
-            )
+            try:
+                await self._db.finish_job_run(
+                    run_id, "failed", json.dumps({"error": str(exc)})
+                )
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist 'failed' status for job '%s' (DB unavailable)", name)
         except Exception as exc:  # noqa: BLE001 - record any failure
             logger.exception("Job '%s' failed", name)
-            await self._db.finish_job_run(
-                run_id, "failed", json.dumps({"error": f"{type(exc).__name__}: {exc}"})
-            )
+            try:
+                await self._db.finish_job_run(
+                    run_id, "failed", json.dumps({"error": f"{type(exc).__name__}: {exc}"})
+                )
+            except Exception:  # noqa: BLE001
+                logger.debug("Could not persist 'failed' status for job '%s' (DB unavailable)", name)
         finally:
             self._running.pop(name, None)

{kryten_webqueue-0.29.0 → kryten_webqueue-0.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryten-webqueue"
-version = "0.29.0"
+version = "0.30.0"
 description = "Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube"
 readme = "README.md"
 license = "MIT"