blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-10-31 18:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split out socket config and switch back to toml crate

Browse source 
basic-toml does not support externally-tagged enum yet.

See: https://github.com/dtolnay/basic-toml/issues/8
This commit is contained in:
oxalica 2024-09-09 01:26:46 -04:00
parent 4f0f1405dc
commit c5263c607c
7 changed files with 92 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

26
blahd/src/bin/blahd.rs
View file

@ -1,7 +1,8 @@
use std::path::PathBuf;
use std::sync::Arc;
use anyhow::{Context, Result};
use blahd::config::Config;
use blahd::config::{Config, ListenConfig};
use blahd::{AppState, Database};
/// Blah Chat Server
@ -29,7 +30,7 @@ fn main() -> Result<()> {
fn parse_config(path: &std::path::Path) -> Result<Config> {
let src = std::fs::read_to_string(path)?;
let config = basic_toml::from_str::<Config>(&src)?;
let config = toml::from_str::<Config>(&src)?;
config.validate()?;
Ok(config)
}
@ -38,12 +39,11 @@ fn main() -> Result<()> {
Cli::Serve { config } => {
let config = parse_config(&config)?;
let db = Database::open(&config.database).context("failed to open database")?;
let st = AppState::new(db, config.server);
tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()
.context("failed to initialize tokio runtime")?
.block_on(st.serve())
.block_on(main_serve(db, config))
}
Cli::Validate { config } => {
parse_config(&config)?;
@ -51,3 +51,21 @@ fn main() -> Result<()> {
}
}
}
async fn main_serve(db: Database, config: Config) -> Result<()> {
let listener = match &config.listen {
ListenConfig::Address(addr) => tokio::net::TcpListener::bind(addr)
.await
.context("failed to listen on socket")?,
};
let st = AppState::new(db, config.server);
tracing::info!("listening on {:?}", config.listen);
let router = blahd::router(Arc::new(st));
let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]);
axum::serve(listener, router)
.await
.context("failed to serve")?;
Ok(())
}