Skip to content

Commit 1eeeb94

Browse files
committed
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
2 parents 3dc369c + 4669a6f commit 1eeeb94

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed

Cargo.lock

Lines changed: 2 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ conduit-router = "0.9.0-alpha.2"
7575
conduit-static = "0.9.0-alpha.3"
7676
conduit-git-http-backend = "0.9.0-alpha.2"
7777
civet = "0.12.0-alpha.3"
78-
conduit-hyper = "0.3.0-alpha.2"
78+
conduit-hyper = "0.3.0-alpha.3"
7979
http = "0.2"
8080

8181
futures-util = "0.3"

src/bin/server.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
6666
let mut rt = tokio::runtime::Builder::new()
6767
.threaded_scheduler()
6868
.enable_all()
69+
.core_threads(4)
70+
.max_threads(threads as usize)
6971
.build()
7072
.unwrap();
7173

72-
let handler = Arc::new(conduit_hyper::BlockingHandler::new(app, threads as usize));
74+
let handler = Arc::new(conduit_hyper::BlockingHandler::new(app));
7375
let make_service =
7476
hyper::service::make_service_fn(move |socket: &hyper::server::conn::AddrStream| {
7577
let addr = socket.remote_addr();

0 commit comments

Comments
 (0)