Commit
+9 -24 +/-3 browse
1 | diff --git a/Cargo.lock b/Cargo.lock |
2 | index b7886d6..2f132f5 100644 |
3 | --- a/Cargo.lock |
4 | +++ b/Cargo.lock |
5 | @@ -2326,12 +2326,6 @@ dependencies = [ |
6 | ] |
7 | |
8 | [[package]] |
9 | - name = "http-range-header" |
10 | - version = "0.3.1" |
11 | - source = "registry+https://github.com/rust-lang/crates.io-index" |
12 | - checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" |
13 | - |
14 | - [[package]] |
15 | name = "httparse" |
16 | version = "1.8.0" |
17 | source = "registry+https://github.com/rust-lang/crates.io-index" |
18 | @@ -5574,17 +5568,16 @@ dependencies = [ |
19 | |
20 | [[package]] |
21 | name = "tower-http" |
22 | - version = "0.4.4" |
23 | + version = "0.5.0" |
24 | source = "registry+https://github.com/rust-lang/crates.io-index" |
25 | - checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" |
26 | + checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d" |
27 | dependencies = [ |
28 | "bitflags 2.4.0", |
29 | "bytes", |
30 | - "futures-core", |
31 | "futures-util", |
32 | - "http 0.2.9", |
33 | - "http-body 0.4.5", |
34 | - "http-range-header", |
35 | + "http 1.0.0", |
36 | + "http-body 1.0.0", |
37 | + "http-body-util", |
38 | "pin-project-lite", |
39 | "tower-layer", |
40 | "tower-service", |
41 | diff --git a/Cargo.toml b/Cargo.toml |
42 | index 9670b23..973d7be 100644 |
43 | --- a/Cargo.toml |
44 | +++ b/Cargo.toml |
45 | @@ -72,9 +72,9 @@ tokio = { version = "1.32.0", features = ["full"] } |
46 | axum = { version = "0.7.3", features = ["macros"] } |
47 | axum-extra = { version = "0.9.1", features = ["cookie"] } |
48 | tokio-util = { version = "0.7.9", features = ["io", "compat"] } |
49 | - tower-http = { version = "0.4.4", features = ["tracing", "add-extension", "trace", "normalize-path"] } |
50 | + tower-http = { version = "0.5.0", features = ["tracing", "add-extension", "trace", "normalize-path"] } |
51 | tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } |
52 | - tracing = "0.1.37" |
53 | + tracing = "0.1.40" |
54 | tower = { version = "0.4.13", features = ["util", "timeout", "tracing"] } |
55 | mime = "0.3.17" |
56 | capnp-rpc = "0.18.0" |
57 | diff --git a/src/web2/server.rs b/src/web2/server.rs |
58 | index 2906991..75ef234 100644 |
59 | --- a/src/web2/server.rs |
60 | +++ b/src/web2/server.rs |
61 | @@ -1,7 +1,7 @@ |
62 | use std::collections::HashMap; |
63 | use std::error::Error; |
64 | use std::fs; |
65 | - use std::net::{SocketAddr, SocketAddrV4}; |
66 | + use std::net::SocketAddrV4; |
67 | use std::sync::Arc; |
68 | |
69 | use axum::{body::Body, http::Request, middleware::from_fn_with_state, routing, Extension, Router}; |
70 | @@ -279,23 +279,15 @@ pub async fn serve(cfg: &Config) -> Result<(), Box<dyn Error>> { |
71 | (cfg.clone(), site_mapping), |
72 | sites::middleware, |
73 | )) |
74 | - /* |
75 | .layer( |
76 | TraceLayer::new_for_http() |
77 | .on_request(|request: &Request<Body>, _span: &Span| { |
78 | tracing::info!("started {} {}", request.method(), request.uri().path()) |
79 | }) |
80 | .on_response(DefaultOnResponse::new().level(Level::INFO)), |
81 | - ) |
82 | - */ |
83 | - ; |
84 | + ); |
85 | log::info!("listening @ {}", cfg.http.address); |
86 | let listener = TcpListener::bind(address).await?; |
87 | axum::serve(listener, router.into_make_service()).await?; |
88 | - /* |
89 | - Server::bind(&SocketAddr::V4(address)) |
90 | - .serve(router.into_make_service()) |
91 | - .await?; |
92 | - */ |
93 | Ok(()) |
94 | } |