Auto merge of #2523 - jtgeibel:update/conduit-hyper, r=JohnTitor

Bump to the latest conduit-hyper The latest upstream changes should allow us to try enabling hyper in production. All tasks tracked in #2204 should now be completed. r? @JohnTitor
rust-lang · May 25, 2020 · 1eeeb94 · 1eeeb94
2 parents 3dc369c + 4669a6f
commit 1eeeb94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,7 +75,7 @@ conduit-router = "0.9.0-alpha.2"
 conduit-static = "0.9.0-alpha.3"
 conduit-git-http-backend = "0.9.0-alpha.2"
 civet = "0.12.0-alpha.3"
-conduit-hyper = "0.3.0-alpha.2"
+conduit-hyper = "0.3.0-alpha.3"
 http = "0.2"
 
 futures-util = "0.3"

diff --git a/src/bin/server.rs b/src/bin/server.rs
@@ -66,10 +66,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let mut rt = tokio::runtime::Builder::new()
             .threaded_scheduler()
             .enable_all()
+            .core_threads(4)
+            .max_threads(threads as usize)
             .build()
             .unwrap();
 
-        let handler = Arc::new(conduit_hyper::BlockingHandler::new(app, threads as usize));
+        let handler = Arc::new(conduit_hyper::BlockingHandler::new(app));
         let make_service =
             hyper::service::make_service_fn(move |socket: &hyper::server::conn::AddrStream| {
                 let addr = socket.remote_addr();