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

require config path via cli, remove env var

Browse source
This commit is contained in:
Charles Hall 2024-06-06 21:34:51 -07:00
parent 3650fde0ac
commit 9b115b4110
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
4 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -108,17 +108,11 @@ async fn main() -> ExitCode {
async fn try_main() -> Result<(), error::Main> {
use error::Main as Error;
args::parse();
let args = args::parse();
// Initialize config
let raw_config = Figment::new()
.merge(
Toml::file({
let name = "GRAPEVINE_CONFIG";
Env::var(name).ok_or(Error::ConfigPathUnset(name))?
})
.nested(),
)
.merge(Toml::file(&args.config).nested())
.merge(Env::prefixed("GRAPEVINE_").global());
let config = raw_config.extract::<Config>()?;