diff --git a/server/src/config.rs b/server/src/config.rs index f55f5d0..79447ff 100644 --- a/server/src/config.rs +++ b/server/src/config.rs @@ -262,7 +262,7 @@ impl Default for ServerConfig { verbose_stats: true, stats_endpoint: "/stats".to_string(), - enable_stats_endpoint: true, + enable_stats_endpoint: false, non_ws_response: ":3".to_string(), diff --git a/server/src/listener.rs b/server/src/listener.rs index 73506d0..32e0136 100644 --- a/server/src/listener.rs +++ b/server/src/listener.rs @@ -338,11 +338,7 @@ impl ServerListener { SocketType::TlsUnix => { Self::TlsUnix(Self::bind_unix().await?, Self::create_tls().await?) } - SocketType::File => { - Self::File(Some(PathBuf::try_from(&CONFIG.server.bind).with_context( - || format!("failed to parse path `{}` for file", CONFIG.server.bind), - )?)) - } + SocketType::File => Self::File(Some(CONFIG.server.bind.clone().into())), }) } diff --git a/server/src/main.rs b/server/src/main.rs index 25b6e46..2312df1 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -200,13 +200,18 @@ async fn main() -> anyhow::Result<()> { let mut listener = ServerListener::new().await?; loop { - let (stream, id) = listener.accept().await?; - tokio::spawn(async move { - let res = route::route(stream, move |stream| handle_stream(stream, id)).await; + let ret = listener.accept().await; + match ret { + Ok((stream, id)) => { + tokio::spawn(async move { + let res = route::route(stream, move |stream| handle_stream(stream, id)).await; - if let Err(e) = res { - error!("error while routing client: {:?}", e); + if let Err(e) = res { + error!("error while routing client: {:?}", e); + } + }); } - }); + Err(e) => error!("error while accepting client: {:?}", e), + } } }