pydocket 0.1.3__tar.gz → 0.1.4__tar.gz

{pydocket-0.1.3 → pydocket-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydocket
-Version: 0.1.3
+Version: 0.1.4
 Summary: A distributed background task system for Python functions
 Project-URL: Homepage, https://github.com/chrisguidry/docket
 Project-URL: Bug Tracker, https://github.com/chrisguidry/docket/issues

{pydocket-0.1.3 → pydocket-0.1.4}/src/docket/docket.py

@@ -184,12 +184,15 @@ class Docket:
                 self.url,
                 single_connection_client=True,
             )
-            async with redis:
+            await redis.__aenter__()
+            try:
                 yield redis
+            finally:
+                await asyncio.shield(redis.__aexit__(None, None, None))
         finally:
             # redis 4.6.0 doesn't automatically disconnect and leaves connections open
             if redis:
-                await redis.connection_pool.disconnect()
+                await asyncio.shield(redis.connection_pool.disconnect())
 
     def register(self, function: Callable[..., Awaitable[Any]]) -> None:
         from .dependencies import validate_dependencies

{pydocket-0.1.3 → pydocket-0.1.4}/src/docket/worker.py

@@ -280,8 +280,6 @@ class Worker:
 
                     for message_id, message in redeliveries:
                         start_task(message_id, message)
-                        if available_slots <= 0:
-                            break
 
                     if available_slots <= 0:
                         continue
@@ -300,8 +298,7 @@ class Worker:
                     for _, messages in new_deliveries:
                         for message_id, message in messages:
                             start_task(message_id, message)
-                            if available_slots <= 0:
-                                break
+
             except asyncio.CancelledError:
                 if active_tasks:  # pragma: no cover
                     logger.info(

{pydocket-0.1.3 → pydocket-0.1.4}/tests/cli/test_snapshot.py

@@ -91,6 +91,45 @@ async def test_snapshot_with_running_tasks(docket: Docket, runner: CliRunner):
         assert "sleep" in result.output
         assert "test-worker" in result.output
 
+        worker_running.cancel()
+        await worker_running
+
+
+async def test_snapshot_with_mixed_tasks(docket: Docket, runner: CliRunner):
+    """Should show both running and scheduled tasks in the snapshot"""
+    heartbeat = timedelta(milliseconds=20)
+    docket.heartbeat_interval = heartbeat
+
+    future = datetime.now(timezone.utc) + timedelta(seconds=5)
+    await docket.add(tasks.trace, when=future)("hi!")
+    for _ in range(5):  # more than the concurrency allows
+        await docket.add(tasks.sleep)(2)
+
+    async with Worker(docket, name="test-worker", concurrency=2) as worker:
+        worker_running = asyncio.create_task(worker.run_until_finished())
+
+        await asyncio.sleep(0.1)
+
+        result = await asyncio.get_running_loop().run_in_executor(
+            None,
+            runner.invoke,
+            app,
+            [
+                "snapshot",
+                "--url",
+                docket.url,
+                "--docket",
+                docket.name,
+            ],
+        )
+        assert result.exit_code == 0, result.output
+
+        assert "1 workers, 2/6 running" in result.output
+        assert "sleep" in result.output
+        assert "test-worker" in result.output
+        assert "trace" in result.output
+
+        worker_running.cancel()
         await worker_running