From 68340ff02e45198bd0e10eebbca665d2adf23a62 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Wed, 3 Mar 2021 10:44:54 +0200
Subject: feat: in errors about reading a configuration file, include its name

---
 src/bin/obnam-server.rs | 15 +++++++++++++--
 src/bin/obnam.rs        | 25 ++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/bin/obnam-server.rs b/src/bin/obnam-server.rs
index d4513fa..47f2b16 100644
--- a/src/bin/obnam-server.rs
+++ b/src/bin/obnam-server.rs
@@ -1,3 +1,4 @@
+use anyhow::Context;
 use bytes::Bytes;
 use log::{debug, error, info};
 use obnam::chunk::DataChunk;
@@ -9,7 +10,7 @@ use serde::Serialize;
 use std::collections::HashMap;
 use std::default::Default;
 use std::net::{SocketAddr, ToSocketAddrs};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use structopt::StructOpt;
 use tokio::sync::Mutex;
@@ -28,7 +29,7 @@ async fn main() -> anyhow::Result<()> {
     pretty_env_logger::init();
 
     let opt = Opt::from_args();
-    let config = Config::read_config(&opt.config).unwrap();
+    let config = load_config(&opt.config)?;
 
     let addresses: Vec<SocketAddr> = config.address.to_socket_addrs()?.collect();
     if addresses.is_empty() {
@@ -83,6 +84,16 @@ async fn main() -> anyhow::Result<()> {
     Ok(())
 }
 
+fn load_config(filename: &Path) -> Result<Config, anyhow::Error> {
+    let config = Config::read_config(&filename).with_context(|| {
+        format!(
+            "Couldn't read default configuration file {}",
+            filename.display()
+        )
+    })?;
+    Ok(config)
+}
+
 pub async fn create_chunk(
     store: Arc<Mutex<IndexedStore>>,
     meta: String,
diff --git a/src/bin/obnam.rs b/src/bin/obnam.rs
index c163695..dd1b26a 100644
--- a/src/bin/obnam.rs
+++ b/src/bin/obnam.rs
@@ -1,3 +1,4 @@
+use anyhow::Context;
 use log::{debug, error, info, LevelFilter};
 use log4rs::append::file::FileAppender;
 use log4rs::config::{Appender, Config, Logger, Root};
@@ -8,12 +9,9 @@ use structopt::StructOpt;
 
 fn main() -> anyhow::Result<()> {
     let opt = Opt::from_args();
-    let config_file = match opt.config {
-        None => default_config(),
-        Some(ref path) => path.to_path_buf(),
-    };
-    let config = ClientConfig::read_config(&config_file)?;
+    let config = load_config(&opt)?;
     setup_logging(&config.log)?;
+    debug!("configuration: {:#?}", config);
 
     info!("client starts");
     debug!("{:?}", opt);
@@ -38,6 +36,23 @@ fn main() -> anyhow::Result<()> {
     Ok(())
 }
 
+fn load_config(opt: &Opt) -> Result<ClientConfig, anyhow::Error> {
+    let config = match opt.config {
+        None => {
+            let filename = default_config();
+            ClientConfig::read_config(&filename).with_context(|| {
+                format!(
+                    "Couldn't read default configuration file {}",
+                    filename.display()
+                )
+            })?
+        }
+        Some(ref filename) => ClientConfig::read_config(&filename)
+            .with_context(|| format!("Couldn't read configuration file {}", filename.display()))?,
+    };
+    Ok(config)
+}
+
 fn default_config() -> PathBuf {
     if let Some(path) = dirs::config_dir() {
         path.join("obnam").join("obnam.yaml")
-- 
cgit v1.2.1