backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

specify listener in error messages and logs

Browse source 
The "listening for incoming traffic on ..." log line is new, but
something I've wanted even when we only supported one listener.

I considered getting rid of `clippy::too_many_lines` by factoring out
the construction of `app` to a separate function, but found that
specifying it's type (or relevant traits) got quite hairy.
This commit is contained in:
Benjamin Lee 2024-06-08 12:52:13 -07:00
parent f7d7952f9b
commit 4f041f9153
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
3 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main.rs
View file

@ -132,6 +132,7 @@ async fn try_main() -> Result<(), error::Main> {
Ok(())
}
#[allow(clippy::too_many_lines)]
async fn run_server() -> Result<(), error::Serve> {
use error::Serve as Error;
@ -204,6 +205,7 @@ async fn run_server() -> Result<(), error::Serve> {
}
for listen in &config.listen {
info!("Listening for incoming traffic on {listen}");
match listen {
ListenConfig::Tcp {
address,
@ -214,8 +216,9 @@ async fn run_server() -> Result<(), error::Serve> {
let handle = ServerHandle::new();
handles.push(handle.clone());
let server = if *tls {
let tls_config =
tls_config.clone().ok_or(Error::NoTlsCerts)?;
let tls_config = tls_config
.clone()
.ok_or_else(|| Error::NoTlsCerts(listen.clone()))?;
bind_rustls(addr, tls_config)
.handle(handle)
.serve(app.clone())
@ -223,7 +226,9 @@ async fn run_server() -> Result<(), error::Serve> {
} else {
bind(addr).handle(handle).serve(app.clone()).right_future()
};
servers.spawn(server);
servers.spawn(
server.then(|result| async { (listen.clone(), result) }),
);
}
}
}
@ -235,9 +240,9 @@ async fn run_server() -> Result<(), error::Serve> {
tokio::spawn(shutdown_signal(handles));
while let Some(result) = servers.join_next().await {
result
.expect("should be able to join server task")
.map_err(Error::Listen)?;
let (listen, result) =
result.expect("should be able to join server task");
result.map_err(|err| Error::Listen(err, listen))?;
}
Ok(())