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

Jump to bottom

Skip global config file if SENTRY_SKIP_GLOBAL_CONFIG exists #1609

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip global config file if SENTRY_SKIP_GLOBAL_CONFIG exists #1609

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
22 changes: 16 additions & 6 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,22 @@ fn load_global_config_file() -> Result<(PathBuf, Ini)> {
}

fn load_cli_config() -> Result<(PathBuf, Ini)> {
let (global_filename, mut rv) = load_global_config_file()?;
let mut rv = Ini::new();
let path: PathBuf;

let (path, mut rv) = if let Some(project_config_path) = find_project_config_file() {
match env::var("SENTRY_SKIP_GLOBAL_CONFIG") {
Ok(_) => {
path = find_project_config_file()
.ok_or_else(|| Error::msg("Failed to find project config file"))?;
}
Err(_) => {
let (global_filename, global_rv) = load_global_config_file()?;
path = global_filename;
rv = global_rv;
}
}

if let Some(project_config_path) = find_project_config_file() {
let file_desc = format!(
"{} file from project path ({})",
CONFIG_RC_FILE_NAME,
Expand All @@ -516,10 +529,7 @@ fn load_cli_config() -> Result<(PathBuf, Ini)> {
rv.set_to(section, key.to_string(), value.to_owned());
}
}
(project_config_path, rv)
} else {
(global_filename, rv)
};
}

if let Ok(prop_path) = env::var("SENTRY_PROPERTIES") {
match fs::File::open(&prop_path) {
Expand Down