From 9e193656c605739d738f9ee1d2a164bab419a07c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 13 Jan 2023 12:54:17 +0100 Subject: Fix error message: We test the client here Signed-off-by: Matthias Beyer --- mqtt-tester/src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mqtt-tester/src/command.rs b/mqtt-tester/src/command.rs index 9e01585..43cc310 100644 --- a/mqtt-tester/src/command.rs +++ b/mqtt-tester/src/command.rs @@ -177,7 +177,7 @@ impl Output { } } Ok(Err(e)) => return Err(e), - Err(_elapsed) => return Err(miette::miette!("Did not hear from server until timeout")), + Err(_elapsed) => return Err(miette::miette!("Did not hear from client until timeout")), } Ok(()) -- cgit v1.2.3 From 580038fabd973089ee465536668de2c617bd3b6e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 Jan 2023 09:44:07 +0100 Subject: Add logging via tracing Signed-off-by: Matthias Beyer --- Cargo.lock | 2 ++ mqtt-tester/Cargo.toml | 2 ++ mqtt-tester/src/main.rs | 14 ++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index db7019e..038ea26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -569,6 +569,8 @@ dependencies = [ "static_assertions", "textwrap 0.16.0", "tokio", + "tracing", + "tracing-subscriber", ] [[package]] diff --git a/mqtt-tester/Cargo.toml b/mqtt-tester/Cargo.toml index 82d3fe7..b2a1ed8 100644 --- a/mqtt-tester/Cargo.toml +++ b/mqtt-tester/Cargo.toml @@ -17,3 +17,5 @@ nom = { version = "7.1.3" } textwrap = "0.16.0" tokio = { version = "1.24", features = ["macros", "process", "rt", "rt-multi-thread", "io-util", "time"] } static_assertions = "1.1.0" +tracing = "0.1" +tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } diff --git a/mqtt-tester/src/main.rs b/mqtt-tester/src/main.rs index dee26a2..9a68848 100644 --- a/mqtt-tester/src/main.rs +++ b/mqtt-tester/src/main.rs @@ -19,6 +19,7 @@ use clap::{Parser, Subcommand}; use client_report::create_client_report; use miette::IntoDiagnostic; use report::{print_report, ReportResult}; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[derive(Parser, Debug)] #[clap(author, version)] @@ -40,6 +41,19 @@ enum Commands { #[tokio::main] async fn main() -> miette::Result<()> { + let fmt_layer = tracing_subscriber::fmt::layer() + .pretty() + .with_timer(tracing_subscriber::fmt::time::uptime()); + + let filter_layer = tracing_subscriber::EnvFilter::from_default_env(); + + tracing_subscriber::registry() + .with(fmt_layer) + .with(filter_layer) + .init(); + + tracing::info!("Starting up"); + let args = Cli::parse(); match args.command { -- cgit v1.2.3 From e3b17105a27af3f00e0816f1c2ff520947c35ed3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 Jan 2023 09:47:20 +0100 Subject: Add log output when building CLI call Signed-off-by: Matthias Beyer --- mqtt-tester/src/executable.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mqtt-tester/src/executable.rs b/mqtt-tester/src/executable.rs index bc361e7..8930a2b 100644 --- a/mqtt-tester/src/executable.rs +++ b/mqtt-tester/src/executable.rs @@ -35,6 +35,11 @@ impl ClientExecutable { }) .collect(); + tracing::debug!( + "Building command: {} {}", + self.path.display(), + args.join(" ") + ); if !args.is_empty() { command.args(args); } -- cgit v1.2.3