Switch to hyper graceful shutdown in test proxy

Author: jtgeibel

Cargo.lock

@@ -79,7 +79,7 @@ civet = "0.9"
 conduit-hyper = { path = "../../jtgeibel/conduit-hyper" }
 
 futures-preview = { version = "0.3.0-alpha.17", features = ["compat"] }
-tokio = { git = "https://github.com/tokio-rs/tokio", default-features = false, features = ["tcp"]}
+tokio = { version = "0.2.0-alpha.1", default-features = false, features = ["tcp"]}
 hyper = { git = "https://github.com/hyperium/hyper" }
 ctrlc = { version = "3.0", features = ["termination"] }
 indexmap = "1.0.2"

Cargo.toml

@@ -11,7 +11,6 @@ use std::{
 
 use civet::Server as CivetServer;
 use conduit_hyper::Service;
-use futures::executor::block_on;
 use jemalloc_ctl;
 use reqwest::Client;
 
@@ -110,7 +109,7 @@ fn main() {
     // Block the main thread until the server has shutdown
     match server {
         Hyper(rt) => {
-            block_on(rt.shutdown_on_idle());
+            rt.shutdown_on_idle();
         }
         Civet(server) => {
             let (tx, rx) = channel::<()>();

src/bin/server.rs

@@ -111,13 +111,17 @@ pub fn proxy() -> (String, Bomb) {
         };
 
         let record = Arc::new(Mutex::new(record));
-        let srv = hyper::Server::builder(listener.incoming()).serve(Proxy {
-            sink: sink2,
-            record: Arc::clone(&record),
-            client,
-        });
+        let srv = hyper::Server::builder(listener.incoming())
+            .serve(Proxy {
+                sink: sink2,
+                record: Arc::clone(&record),
+                client,
+            })
+            .with_graceful_shutdown(async {
+                quitrx.await.ok();
+            });
 
-        drop(rt.block_on(future::select(srv, quitrx)));
+        rt.block_on(srv).ok();
 
         let record = record.lock().unwrap();
         match *record {