From ce81e5dcb6d48d64148cc72e9113446ae5fed1b3 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 18 Oct 2019 12:47:34 -0400 Subject: debug-log the final configuration --- src/cmd.rs | 1 + src/cmd/play.rs | 2 +- src/cmd/record.rs | 2 +- src/cmd/server.rs | 2 +- src/cmd/stream.rs | 2 +- src/cmd/watch.rs | 2 +- src/config.rs | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cmd.rs b/src/cmd.rs index 14312be..36151a8 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -100,6 +100,7 @@ pub fn run(matches: &clap::ArgMatches<'_>) -> Result<()> { let mut cmd_config = (chosen_cmd.config)(config); cmd_config.merge_args(chosen_submatches)?; + log::debug!("{:?}", cmd_config); cmd_config.run() } diff --git a/src/cmd/play.rs b/src/cmd/play.rs index bc8a214..c99a697 100644 --- a/src/cmd/play.rs +++ b/src/cmd/play.rs @@ -1,7 +1,7 @@ use crate::prelude::*; use std::io::Write as _; -#[derive(serde::Deserialize)] +#[derive(serde::Deserialize, Debug)] pub struct Config { #[serde(default = "crate::config::default_ttyrec_filename")] filename: String, diff --git a/src/cmd/record.rs b/src/cmd/record.rs index 08206b5..7481f92 100644 --- a/src/cmd/record.rs +++ b/src/cmd/record.rs @@ -1,7 +1,7 @@ use crate::prelude::*; use tokio::io::AsyncWrite as _; -#[derive(serde::Deserialize)] +#[derive(serde::Deserialize, Debug)] pub struct Config { #[serde(default = "crate::config::default_ttyrec_filename")] filename: String, diff --git a/src/cmd/server.rs b/src/cmd/server.rs index c0e179d..97c754b 100644 --- a/src/cmd/server.rs +++ b/src/cmd/server.rs @@ -2,7 +2,7 @@ use crate::prelude::*; use std::convert::TryFrom as _; use std::io::Read as _; -#[derive(serde::Deserialize)] +#[derive(serde::Deserialize, Debug)] pub struct Config { #[serde( deserialize_with = "crate::config::listen_address", diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs index d52c410..95c1191 100644 --- a/src/cmd/stream.rs +++ b/src/cmd/stream.rs @@ -1,7 +1,7 @@ use crate::prelude::*; use tokio::io::AsyncWrite as _; -#[derive(serde::Deserialize)] +#[derive(serde::Deserialize, Debug)] pub struct Config { #[serde( deserialize_with = "crate::config::auth", diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs index d17cf33..853e5ea 100644 --- a/src/cmd/watch.rs +++ b/src/cmd/watch.rs @@ -1,7 +1,7 @@ use crate::prelude::*; use std::io::Write as _; -#[derive(serde::Deserialize)] +#[derive(serde::Deserialize, Debug)] pub struct Config { #[serde( deserialize_with = "crate::config::auth", diff --git a/src/config.rs b/src/config.rs index 03a5061..0b8099c 100644 --- a/src/config.rs +++ b/src/config.rs @@ -13,7 +13,7 @@ const DEFAULT_AUTH_TYPE: crate::protocol::AuthType = const DEFAULT_TLS: bool = false; const DEFAULT_TTYREC_FILENAME: &str = "teleterm.ttyrec"; -pub trait Config { +pub trait Config: std::fmt::Debug { fn merge_args<'a>( &mut self, matches: &clap::ArgMatches<'a>, -- cgit v1.2.3-54-g00ecf