Add delayed shutdown

Author: Jakobhenningjensen

docs/deployment.md

@@ -114,6 +114,8 @@ Options:
   --timeout-graceful-shutdown INTEGER
                                   Maximum number of seconds to wait for
                                   graceful shutdown.
+  --delayed-shutdown FLOAT
+                                  Time in seconds to delay shutdown when a shutdown-signal is received
   --ssl-keyfile TEXT              SSL key file
   --ssl-certfile TEXT             SSL certificate file
   --ssl-keyfile-password TEXT     SSL keyfile password

uvicorn/config.py

@@ -223,6 +223,7 @@ def __init__(
         headers: list[tuple[str, str]] | None = None,
         factory: bool = False,
         h11_max_incomplete_event_size: int | None = None,
+        shutdown_delay: float = 0,
     ):
         self.app = app
         self.host = host
@@ -268,6 +269,7 @@ def __init__(
         self.encoded_headers: list[tuple[bytes, bytes]] = []
         self.factory = factory
         self.h11_max_incomplete_event_size = h11_max_incomplete_event_size
+        self.shutdown_delay = shutdown_delay
 
         self.loaded = False
         self.configure_logging()

uvicorn/main.py

@@ -408,6 +408,7 @@ def main(
     app_dir: str,
     h11_max_incomplete_event_size: int | None,
     factory: bool,
+    shutdown_delay: float = 0,
 ) -> None:
     run(
         app,
@@ -457,6 +458,7 @@ def main(
         factory=factory,
         app_dir=app_dir,
         h11_max_incomplete_event_size=h11_max_incomplete_event_size,
+        shutdown_delay=shutdown_delay
     )
 
 
@@ -509,6 +511,7 @@ def run(
     app_dir: str | None = None,
     factory: bool = False,
     h11_max_incomplete_event_size: int | None = None,
+    shutdown_delay: float = 0,
 ) -> None:
     if app_dir is not None:
         sys.path.insert(0, app_dir)
@@ -560,6 +563,7 @@ def run(
         use_colors=use_colors,
         factory=factory,
         h11_max_incomplete_event_size=h11_max_incomplete_event_size,
+        shutdown_delay=shutdown_delay
     )
     server = Server(config=config)
 

uvicorn/server.py

@@ -259,8 +259,12 @@ async def on_tick(self, counter: int) -> bool:
         return False
 
     async def shutdown(self, sockets: list[socket.socket] | None = None) -> None:
-        logger.info("Shutting down")
+        if self.config.shutdown_delay:
+            logger.info(f"Shutting down in {self.config.shutdown_delay} seconds")
+            self.config.app.uvicorn_shutdown_triggered = True
+            await asyncio.sleep(self.config.shutdown_delay)
 
+        logger.info("Shutting down")
         # Stop accepting new connections.
         for server in self.servers:
             server.close()