diff options
-rw-r--r-- | src/bin/obnam-server.rs | 19 | ||||
-rw-r--r-- | src/bin/obnam.rs | 25 | ||||
-rw-r--r-- | src/server.rs | 16 |
3 files changed, 43 insertions, 17 deletions
diff --git a/src/bin/obnam-server.rs b/src/bin/obnam-server.rs index d4513fa..ddbfce3 100644 --- a/src/bin/obnam-server.rs +++ b/src/bin/obnam-server.rs @@ -1,15 +1,16 @@ +use anyhow::Context; use bytes::Bytes; use log::{debug, error, info}; use obnam::chunk::DataChunk; use obnam::chunkid::ChunkId; use obnam::chunkmeta::ChunkMeta; use obnam::indexedstore::IndexedStore; -use obnam::server::{Config, ConfigError}; +use obnam::server::{ServerConfig, ServerConfigError}; 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,13 +29,13 @@ 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() { error!("specified address is empty set: {:?}", addresses); eprintln!("ERROR: server address is empty: {:?}", addresses); - return Err(ConfigError::BadServerAddress.into()); + return Err(ServerConfigError::BadServerAddress.into()); } let store = IndexedStore::new(&config.chunks)?; @@ -83,6 +84,16 @@ async fn main() -> anyhow::Result<()> { Ok(()) } +fn load_config(filename: &Path) -> Result<ServerConfig, anyhow::Error> { + let config = ServerConfig::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") diff --git a/src/server.rs b/src/server.rs index 01a6958..2bd32ef 100644 --- a/src/server.rs +++ b/src/server.rs @@ -7,7 +7,7 @@ use std::default::Default; use std::path::{Path, PathBuf}; #[derive(Debug, Deserialize, Clone)] -pub struct Config { +pub struct ServerConfig { pub chunks: PathBuf, pub address: String, pub tls_key: PathBuf, @@ -15,7 +15,7 @@ pub struct Config { } #[derive(Debug, thiserror::Error)] -pub enum ConfigError { +pub enum ServerConfigError { #[error("Directory for chunks {0} does not exist")] ChunksDirNotFound(PathBuf), @@ -29,23 +29,23 @@ pub enum ConfigError { BadServerAddress, } -impl Config { - pub fn read_config(filename: &Path) -> anyhow::Result<Config> { +impl ServerConfig { + pub fn read_config(filename: &Path) -> anyhow::Result<Self> { let config = std::fs::read_to_string(filename)?; - let config: Config = serde_yaml::from_str(&config)?; + let config: Self = serde_yaml::from_str(&config)?; config.check()?; Ok(config) } pub fn check(&self) -> anyhow::Result<()> { if !self.chunks.exists() { - return Err(ConfigError::ChunksDirNotFound(self.chunks.clone()).into()); + return Err(ServerConfigError::ChunksDirNotFound(self.chunks.clone()).into()); } if !self.tls_cert.exists() { - return Err(ConfigError::TlsCertNotFound(self.tls_cert.clone()).into()); + return Err(ServerConfigError::TlsCertNotFound(self.tls_cert.clone()).into()); } if !self.tls_key.exists() { - return Err(ConfigError::TlsKeyNotFound(self.tls_key.clone()).into()); + return Err(ServerConfigError::TlsKeyNotFound(self.tls_key.clone()).into()); } Ok(()) } |