5 files changed, 25 insertions, 10 deletions
diff --git a/src/cmd/play.rs b/src/cmd/play.rs
index a5fd534..bc8a214 100644
--- a/src/cmd/play.rs
+++ b/src/cmd/play.rs
@@ -43,8 +43,11 @@ pub fn cmd<'a, 'b>(app: clap::App<'a, 'b>) -> clap::App<'a, 'b> {
     )
 }
 
-pub fn config() -> Box<dyn crate::config::Config> {
-    Box::new(Config::default())
+pub fn config(config: config::Config) -> Box<dyn crate::config::Config> {
+    Box::new(config.try_into().unwrap_or_else(|e| {
+        log::warn!("failed to parse config data: {}", e);
+        Config::default()
+    }))
 }
 
 #[allow(clippy::large_enum_variant)]
diff --git a/src/cmd/record.rs b/src/cmd/record.rs
index afdfcd6..08206b5 100644
--- a/src/cmd/record.rs
+++ b/src/cmd/record.rs
@@ -84,8 +84,11 @@ pub fn cmd<'a, 'b>(app: clap::App<'a, 'b>) -> clap::App<'a, 'b> {
         .arg(clap::Arg::with_name("args").index(2).multiple(true))
 }
 
-pub fn config() -> Box<dyn crate::config::Config> {
-    Box::new(Config::default())
+pub fn config(config: config::Config) -> Box<dyn crate::config::Config> {
+    Box::new(config.try_into().unwrap_or_else(|e| {
+        log::warn!("failed to parse config data: {}", e);
+        Config::default()
+    }))
 }
 
 #[allow(clippy::large_enum_variant)]
diff --git a/src/cmd/server.rs b/src/cmd/server.rs
index ae96a86..c0e179d 100644
--- a/src/cmd/server.rs
+++ b/src/cmd/server.rs
@@ -142,8 +142,11 @@ pub fn cmd<'a, 'b>(app: clap::App<'a, 'b>) -> clap::App<'a, 'b> {
         )
 }
 
-pub fn config() -> Box<dyn crate::config::Config> {
-    Box::new(Config::default())
+pub fn config(config: config::Config) -> Box<dyn crate::config::Config> {
+    Box::new(config.try_into().unwrap_or_else(|e| {
+        log::warn!("failed to parse config data: {}", e);
+        Config::default()
+    }))
 }
 
 fn create_server(
diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs
index 2e1ea03..d52c410 100644
--- a/src/cmd/stream.rs
+++ b/src/cmd/stream.rs
@@ -172,8 +172,11 @@ pub fn cmd<'a, 'b>(app: clap::App<'a, 'b>) -> clap::App<'a, 'b> {
         .arg(clap::Arg::with_name("args").index(2).multiple(true))
 }
 
-pub fn config() -> Box<dyn crate::config::Config> {
-    Box::new(Config::default())
+pub fn config(config: config::Config) -> Box<dyn crate::config::Config> {
+    Box::new(config.try_into().unwrap_or_else(|e| {
+        log::warn!("failed to parse config data: {}", e);
+        Config::default()
+    }))
 }
 
 struct StreamSession<
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
index cde2fae..d17cf33 100644
--- a/src/cmd/watch.rs
+++ b/src/cmd/watch.rs
@@ -137,8 +137,11 @@ pub fn cmd<'a, 'b>(app: clap::App<'a, 'b>) -> clap::App<'a, 'b> {
         .arg(clap::Arg::with_name("tls").long("tls"))
 }
 
-pub fn config() -> Box<dyn crate::config::Config> {
-    Box::new(Config::default())
+pub fn config(config: config::Config) -> Box<dyn crate::config::Config> {
+    Box::new(config.try_into().unwrap_or_else(|e| {
+        log::warn!("failed to parse config data: {}", e);
+        Config::default()
+    }))
 }
 
 // XXX https://github.com/rust-lang/rust/issues/64362