Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2024-11-22 13:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Accept environment variables in configuration

Browse Source
This commit is contained in:
Pierre HUBERT 2021-10-16 17:34:27 +02:00
parent 30f427b61c
commit 43c76fa120
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/data/config.rs
View File

@ -60,7 +60,7 @@ static mut CONF: Option<Config> = None;
impl Config { impl Config {
fn yaml_str(parsed: &Yaml, name: &str) -> String { fn yaml_str(parsed: &Yaml, name: &str) -> String {
match &parsed[name] { let val = match &parsed[name] {
Yaml::Real(r) | Yaml::String(r) => r.to_string(), Yaml::Real(r) | Yaml::String(r) => r.to_string(),
Yaml::Integer(i) => i.to_string(), Yaml::Integer(i) => i.to_string(),
Yaml::Boolean(true) => "true".to_string(), Yaml::Boolean(true) => "true".to_string(),
@ -71,7 +71,14 @@ impl Config {
Yaml::BadValue => { Yaml::BadValue => {
panic!("{} is missing", name); panic!("{} is missing", name);
} }
}.to_string() }.to_string();
// Check if we have to get an environment variable
if val.starts_with("$") {
std::env::var(&val[1..]).unwrap()
} else {
val
}
} }
fn yaml_u64(parsed: &Yaml, name: &str) -> u64 { fn yaml_u64(parsed: &Yaml, name: &str) -> u64 {