mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-12 14:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

make accept errors nonfatal, fixes #6, also default to stats endpoint off

Browse source
This commit is contained in:
Toshit Chawda 2024-09-19 16:04:46 -07:00
parent 7fdacb2623
commit f798b5544e
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/src/config.rs
View file

@ -262,7 +262,7 @@ impl Default for ServerConfig {
verbose_stats: true, verbose_stats: true,
stats_endpoint: "/stats".to_string(), stats_endpoint: "/stats".to_string(),
enable_stats_endpoint: true, enable_stats_endpoint: false,
non_ws_response: ":3".to_string(), non_ws_response: ":3".to_string(),

6
server/src/listener.rs
View file

@ -338,11 +338,7 @@ impl ServerListener {
SocketType::TlsUnix => { SocketType::TlsUnix => {
Self::TlsUnix(Self::bind_unix().await?, Self::create_tls().await?) Self::TlsUnix(Self::bind_unix().await?, Self::create_tls().await?)
} }
SocketType::File => { SocketType::File => Self::File(Some(CONFIG.server.bind.clone().into())),
Self::File(Some(PathBuf::try_from(&CONFIG.server.bind).with_context(
|| format!("failed to parse path `{}` for file", CONFIG.server.bind),
)?))
}
}) })
} }

17
server/src/main.rs
View file

@ -200,13 +200,18 @@ async fn main() -> anyhow::Result<()> {
let mut listener = ServerListener::new().await?; let mut listener = ServerListener::new().await?;
loop { loop {
let (stream, id) = listener.accept().await?; let ret = listener.accept().await;
tokio::spawn(async move { match ret {
let res = route::route(stream, move |stream| handle_stream(stream, id)).await; Ok((stream, id)) => {
tokio::spawn(async move {
let res = route::route(stream, move |stream| handle_stream(stream, id)).await;
if let Err(e) = res { if let Err(e) = res {
error!("error while routing client: {:?}", e); error!("error while routing client: {:?}", e);
}
});
} }
}); Err(e) => error!("error while accepting client: {:?}", e),
}
} }
} }