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

distinct error types for running server

Browse source 
This is in preparation for the config change to allow specifying
multiple listeners, which will add several other possible error
conditions.
This commit is contained in:
Benjamin Lee 2024-06-08 12:21:07 -07:00
parent 76b060aa84
commit b7ad00ef6e
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main.rs
View file

@ -1,6 +1,5 @@
use std::{
future::Future,
io,
net::SocketAddr,
process::ExitCode,
sync::{atomic, RwLock},
@ -127,12 +126,14 @@ async fn try_main() -> Result<(), error::Main> {
.map_err(Error::DatabaseError)?;
info!("Starting server");
run_server().await.map_err(Error::Serve)?;
run_server().await?;
Ok(())
}
async fn run_server() -> io::Result<()> {
async fn run_server() -> Result<(), error::Serve> {
use error::Serve as Error;
let config = &services().globals.config;
let addr = SocketAddr::from((config.address, config.port));
@ -189,15 +190,20 @@ async fn run_server() -> io::Result<()> {
match &config.tls {
Some(tls) => {
let conf =
RustlsConfig::from_pem_file(&tls.certs, &tls.key).await?;
let conf = RustlsConfig::from_pem_file(&tls.certs, &tls.key)
.await
.map_err(|err| Error::LoadCerts {
certs: tls.certs.clone(),
key: tls.key.clone(),
err,
})?;
let server = bind_rustls(addr, conf).handle(handle).serve(app);
#[cfg(feature = "systemd")]
sd_notify::notify(true, &[sd_notify::NotifyState::Ready])
.expect("should be able to notify systemd");
server.await?;
server.await.map_err(Error::Listen)?;
}
None => {
let server = bind(addr).handle(handle).serve(app);
@ -206,7 +212,7 @@ async fn run_server() -> io::Result<()> {
sd_notify::notify(true, &[sd_notify::NotifyState::Ready])
.expect("should be able to notify systemd");
server.await?;
server.await.map_err(Error::Listen)?;
}
}