Improve configuration error messages

Rel #24
breard-r · Aug 25, 2020 · 87f97ec · 87f97ec
1 parent 566d09a
commit 87f97ec
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/acmed/src/config.rs b/acmed/src/config.rs
@@ -479,10 +479,13 @@ fn get_cnf_path(from: &PathBuf, file: &str) -> Result<Vec<PathBuf>, Error> {
 
 fn read_cnf(path: &PathBuf) -> Result<Config, Error> {
  info!("Loading configuration file: {}", path.display());
- let mut file = File::open(path)?;
+ let mut file =
+ File::open(path).map_err(|e| Error::from(e).prefix(&path.display().to_string()))?;
  let mut contents = String::new();
- file.read_to_string(&mut contents)?;
- let mut config: Config = toml::from_str(&contents)?;
+ file.read_to_string(&mut contents)
+ .map_err(|e| Error::from(e).prefix(&path.display().to_string()))?;
+ let mut config: Config = toml::from_str(&contents)
+ .map_err(|e| Error::from(e).prefix(&path.display().to_string()))?;
  for cnf_name in config.include.iter() {
  for cnf_path in get_cnf_path(path, cnf_name)? {
  let mut add_cnf = read_cnf(&cnf_path)?;