From 3ed622da5463b779a4c4dbc88d1d32df16dce678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20P=C3=A9rez?= Date: Mon, 14 Aug 2023 20:39:59 +0000 Subject: [PATCH] chore: fix http mode load --- src/main.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index bb528d7..b56beae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -335,16 +335,22 @@ async fn main() { ); } let addr = get_socket_addr(&config.bind,config.port); - tracing::debug!("listening on {}", addr); - println!("listening on {}", addr); + tracing::debug!("listening on {} url: {}://{}", addr, config.protocol, config.hostport); + println!("listening on {} url: {}://{}", addr, config.protocol, config.hostport); if config.protocol.as_str() == "http" { // let app_with_middleware = middleware.layer(app); // run https server //let addr = SocketAddr::from(([127, 0, 0, 1], ports.http)); //tracing::debug!("listening on {}", addr); + // .into_make_service_with_connect_info::() + //.into_make_service_with_connect_info::() + if config.verbose > 0 { + web_router = web_router.layer(TraceLayer::new_for_http()); + } let listener = tokio::net::TcpListener::bind(addr).await.unwrap(); - axum::serve(listener, web_router.layer(TraceLayer::new_for_http()) - .into_make_service_with_connect_info::() + // web_router.into_make_service_with_connect_info::() + axum::serve(listener, web_router + .into_make_service_with_connect_info::() ) .await .unwrap(); @@ -372,6 +378,9 @@ async fn main() { //let app_with_middleware = middleware.layer(app); // apply the layer around the whole `Router`middleware.layer(app); // .serve(web_router.into_make_service()) + if config.verbose > 0 { + web_router = web_router.layer(TraceLayer::new_for_http()); + } axum_server::bind_rustls(addr, tls_config) .serve( // web_router.layer(TraceLayer::new_for_http())