Merge branch 'feature/RED-10441' into 'master'

RED-10441: separate queue and webserver shutdown

See merge request knecon/research/pyinfra!105

pyinfra/examples.py

@@ -34,11 +34,14 @@ async def graceful_shutdown(manager: AsyncQueueManager, queue_task, webserver_ta
     if queue_task and not queue_task.done():
         queue_task.cancel()
 
+    # await queue manager shutdown
+    await asyncio.gather(queue_task, manager.shutdown(), return_exceptions=True)
+
     if webserver_task and not webserver_task.done():
         webserver_task.cancel()
 
-    # explicitly shutdown manager and webserver
-    await asyncio.gather(queue_task, manager.shutdown(), webserver_task, return_exceptions=True)
+    # await webserver shutdown
+    await asyncio.gather(webserver_task, return_exceptions=True)
 
     logger.info("Shutdown complete.")
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyinfra"
-version = "3.3.4"
+version = "3.3.5"
 description = ""
 authors = ["Team Research <research@knecon.com>"]
 license = "All rights reseverd"