thek0tyara/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

fix(reload): Store paths to config files for admin reload

Browse source 
Paths given via --config at startup are now stored inside the config
struct at runtime, to make it possible to reload config without setting
an env var for the config file location.
This commit is contained in:
Odd E. Ebbesen 2025-12-15 16:13:00 +01:00 • committed by Odd E. Ebbesen
parent 64e187e5b4
commit 867d0ab671
4 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/server.rs
View file

@ -1,4 +1,4 @@
use std::{path::PathBuf, sync::Arc};
use std::sync::Arc;
use conduwuit_core::{
Error, Result,
@ -38,14 +38,9 @@ impl Server {
) -> Result<Arc<Self>, Error> {
let _runtime_guard = runtime.map(runtime::Handle::enter);
let config_paths = args
.config
.as_deref()
.into_iter()
.flat_map(<[_]>::iter)
.map(PathBuf::as_path);
let config_paths = args.config.clone().unwrap_or_default();
let config = Config::load(config_paths)
let config = Config::load(&config_paths)
.and_then(|raw| update(raw, args))
.and_then(|raw| Config::new(&raw))?;