diff options
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | mqtt-tester/Cargo.toml | 2 | ||||
| -rw-r--r-- | mqtt-tester/src/command.rs | 2 | ||||
| -rw-r--r-- | mqtt-tester/src/executable.rs | 5 | ||||
| -rw-r--r-- | mqtt-tester/src/main.rs | 14 |
5 files changed, 24 insertions, 1 deletions
@@ -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/command.rs b/mqtt-tester/src/command.rs index d0d9979..8e36b46 100644 --- a/mqtt-tester/src/command.rs +++ b/mqtt-tester/src/command.rs @@ -128,7 +128,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(()) 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); } 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 { |