Merge pull request #232 from itowlson/if-you-dont-shut-down-politely-when-i-tell-you-then-youre-going-in-the-naughty-corner

Work around hyper graceful shutdown bug

Author: itowlson

crates/http/src/lib.rs

@@ -210,14 +210,16 @@ impl HttpTrigger {
 
         let shutdown_signal = on_ctrl_c()?;
 
-        Server::bind(&addr)
-            .serve(mk_svc)
-            .with_graceful_shutdown(async {
-                shutdown_signal.await.ok();
-            })
-            .await?;
+        let server = Server::bind(&addr).serve(mk_svc);
 
-        log::debug!("User requested shutdown: exiting");
+        tokio::select! {
+            _ = server => {
+                log::debug!("Server shut down: exiting");
+            },
+            _ = shutdown_signal => {
+                log::debug!("User requested shutdown: exiting");
+            },
+        };
 
         Ok(())
     }
@@ -274,14 +276,16 @@ impl HttpTrigger {
 
         let shutdown_signal = on_ctrl_c()?;
 
-        Server::builder(incoming)
-            .serve(mk_svc)
-            .with_graceful_shutdown(async {
-                shutdown_signal.await.ok();
-            })
-            .await?;
+        let server = Server::builder(incoming).serve(mk_svc);
 
-        log::debug!("User requested shutdown: exiting");
+        tokio::select! {
+            _ = server => {
+                log::debug!("Server shut down: exiting");
+            },
+            _ = shutdown_signal => {
+                log::debug!("User requested shutdown: exiting");
+            },
+        };
 
         Ok(())
     }