Merge branch 'main' into feat/rama-http-core

plabayo · Nov 6, 2024 · 01ed5e3 · 01ed5e3
2 parents 8d0e7c0 + 61c71e2
commit 01ed5e3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/rama-http-backend/src/server/service.rs b/rama-http-backend/src/server/service.rs
@@ -699,11 +699,12 @@ where
         Response: IntoResponse + Send + 'static,
         A: ToSocketAddrs,
     {
-        TcpListener::build_with_state(state)
-            .bind(addr)
-            .await?
-            .serve(self.service(service))
-            .await;
+        let tcp = TcpListener::build_with_state(state).bind(addr).await?;
+        let service = HttpService::new(self.builder, service);
+        match self.guard {
+            Some(guard) => tcp.serve_graceful(guard, service).await,
+            None => tcp.serve(service).await,
+        };
         Ok(())
     }
 }