Skip to content
Snippets Groups Projects
Commit 1da3048b authored by 🥺's avatar 🥺 :transgender_flag: Committed by 🥺
Browse files

allow accepting `CONDUWUIT_` prefixed config options

parent 894902b7
No related branches found
No related tags found
No related merge requests found
......@@ -368,12 +368,21 @@ pub(crate) fn new(path: Option<PathBuf>) -> Result<Self, Error> {
Figment::new()
.merge(Toml::file(config_file_env).nested())
.merge(Env::prefixed("CONDUIT_").global())
.merge(Env::prefixed("CONDUWUIT_").global())
} else if let Some(config_file_arg) = Env::var("CONDUWUIT_CONFIG") {
Figment::new()
.merge(Toml::file(config_file_arg).nested())
.merge(Env::prefixed("CONDUIT_").global())
.merge(Env::prefixed("CONDUWUIT_").global())
} else if let Some(config_file_arg) = path {
Figment::new()
.merge(Toml::file(config_file_arg).nested())
.merge(Env::prefixed("CONDUIT_").global())
.merge(Env::prefixed("CONDUWUIT_").global())
} else {
Figment::new().merge(Env::prefixed("CONDUIT_").global())
Figment::new()
.merge(Env::prefixed("CONDUIT_").global())
.merge(Env::prefixed("CONDUWUIT_").global())
};
let config = match raw_config.extract::<Config>() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment