nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-16 06:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: slight refactoring

Browse Source
This commit is contained in:
Lennart
2025-12-10 12:25:13 +01:00
parent a686286d06
commit e8303b9c82
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@@ -91,21 +91,22 @@ async fn get_data_stores(
async fn main() -> Result<()> { async fn main() -> Result<()> {
let args = Args::parse(); let args = Args::parse();
let parse_config = || {
Figment::new()
.merge(Toml::file(&args.config_file))
.merge(Env::prefixed("RUSTICAL_").split("__"))
.extract()
};
match args.command { match args.command {
Some(Command::GenConfig(gen_config_args)) => cmd_gen_config(gen_config_args)?, Some(Command::GenConfig(gen_config_args)) => cmd_gen_config(gen_config_args)?,
Some(Command::Principals(principals_args)) => cmd_principals(principals_args).await?, Some(Command::Principals(principals_args)) => cmd_principals(principals_args).await?,
Some(Command::Health(health_args)) => { Some(Command::Health(health_args)) => {
let config: Config = Figment::new() let config: Config = parse_config()?;
.merge(Toml::file(&args.config_file))
.merge(Env::prefixed("RUSTICAL_").split("__"))
.extract()?;
cmd_health(config.http, health_args).await?; cmd_health(config.http, health_args).await?;
} }
None => { None => {
let config: Config = Figment::new() let config: Config = parse_config()?;
.merge(Toml::file(&args.config_file))
.merge(Env::prefixed("RUSTICAL_").split("__"))
.extract()?;
setup_tracing(&config.tracing); setup_tracing(&config.tracing);