Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update lib config 0.11 to 0.13 #3205

Merged
merged 1 commit into from
Nov 4, 2022
Merged

update lib config 0.11 to 0.13 #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion massa-models/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
num = { version = "0.4", features = ["serde"] }
directories = "4.0"
config = "0.11"
config = "0.13"
bs58 = { version = "0.4", features = ["check"] }
bitvec = { version = "1.0", features = ["serde"] }
nom = "7.1"
Expand Down
43 changes: 14 additions & 29 deletions massa-models/src/config/massa_settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,47 +33,32 @@ use std::path::Path;
/// 3. in path specified in `MASSA_CONFIG_OVERRIDE_PATH` environment variable (`config/config.toml` by default)
#[inline]
pub fn build_massa_settings<T: Deserialize<'static>>(app_name: &str, env_prefix: &str) -> T {
let mut settings = config::Config::default();
let mut builder = config::Config::builder();
let config_path = std::env::var("MASSA_CONFIG_PATH")
.unwrap_or_else(|_| "base_config/config.toml".to_string());
settings
.merge(config::File::with_name(&config_path))
.unwrap_or_else(|error| {
panic!(
"failed to read {} config {}: {}",
config_path,
std::env::current_dir().unwrap().as_path().to_str().unwrap(),
error
)
});

builder = builder.add_source(config::File::with_name(&config_path));

let config_override_path = std::env::var("MASSA_CONFIG_OVERRIDE_PATH")
.unwrap_or_else(|_| "config/config.toml".to_string());

if Path::new(&config_override_path).is_file() {
settings
.merge(config::File::with_name(&config_override_path))
.unwrap_or_else(|error| {
panic!(
"failed to read {} override config {}: {}",
config_override_path,
std::env::current_dir().unwrap().as_path().to_str().unwrap(),
error
)
});
builder = builder.add_source(config::File::with_name(&config_override_path));
}

if let Some(proj_dirs) = ProjectDirs::from("com", "MassaLabs", app_name) {
// Portable user config loading
let user_config_path = proj_dirs.config_dir();
if user_config_path.exists() {
let path_str = user_config_path.to_str().unwrap();
settings
.merge(config::File::with_name(path_str))
.unwrap_or_else(|error| {
panic!("failed to read {} user config: {}", path_str, error)
});
builder = builder.add_source(config::File::with_name(path_str));
}
}
settings
.merge(config::Environment::with_prefix(env_prefix))

let s = builder
.add_source(config::Environment::with_prefix(env_prefix))
.build()
.unwrap();
settings.try_into().unwrap()

s.try_deserialize().unwrap()
}