From a81d208c0da198884f323d0f9de92f887bdce8ee Mon Sep 17 00:00:00 2001 From: Nils Andreas Svee Date: Wed, 22 Apr 2026 22:09:26 +0700 Subject: [PATCH] style: refine logging verbosity and improve diagnostic messages Demote baseline telemetry to debug level, add context to rate controller warnings, and remove redundant string conversions in reflector selection logs. --- src/baseliner.rs | 6 +++--- src/ratecontroller.rs | 10 +++++++--- src/reflector_selector.rs | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/baseliner.rs b/src/baseliner.rs index bc6fa59..7b61dd9 100644 --- a/src/baseliner.rs +++ b/src/baseliner.rs @@ -4,7 +4,7 @@ use crate::metrics::{Metric, MetricsSender}; use crate::pinger::PingReply; use crate::util::ArcMutex; use crate::util::MutexExt; -use log::info; +use log::{debug, info}; use std::collections::HashMap; use std::net::IpAddr; use std::sync::atomic::Ordering; @@ -147,11 +147,11 @@ impl Baseliner { recent_down_ewma: owd_recent.down_ewma, }); - info!( + debug!( "Reflector {} up baseline = {} down baseline = {}", time_data.reflector, owd_baseline.up_ewma, owd_baseline.down_ewma ); - info!( + debug!( "Reflector {} up recent = {} down recent = {}", time_data.reflector, owd_recent.up_ewma, owd_recent.down_ewma ); diff --git a/src/ratecontroller.rs b/src/ratecontroller.rs index 1166f2d..83b54b3 100644 --- a/src/ratecontroller.rs +++ b/src/ratecontroller.rs @@ -235,7 +235,11 @@ impl Ratecontroller { if state_dl.deltas.len() < 5 || state_ul.deltas.len() < 5 { // trigger reselection - warn!("Not enough delta values, triggering reselection"); + warn!( + "Not enough delta values (D: {}, U: {}, need 5), triggering reselection", + state_dl.deltas.len(), + state_ul.deltas.len() + ); let _ = self.reselect_trigger.send(true); } @@ -390,8 +394,8 @@ impl Ratecontroller { || self.state_ul.next_rate != self.state_ul.current_rate { info!( - "self.state_ul.next_rate {} self.state_dl.next_rate {}", - self.state_ul.next_rate, self.state_dl.next_rate + "Adjusting rates (D/U): {} / {} kbit/s", + self.state_dl.next_rate as u64, self.state_ul.next_rate as u64 ); } diff --git a/src/reflector_selector.rs b/src/reflector_selector.rs index 59318e4..8511850 100644 --- a/src/reflector_selector.rs +++ b/src/reflector_selector.rs @@ -62,7 +62,7 @@ impl ReflectorSelector { // Include all current peers for reflector in reflectors_peers.iter() { - debug!("Current peer: {}", reflector.to_string()); + debug!("Current peer: {}", reflector); next_peers.push(*reflector); } @@ -72,7 +72,7 @@ impl ReflectorSelector { if next_peers.contains(next_candidate) { continue; } - debug!("Next candidate: {}", next_candidate.to_string()); + debug!("Next candidate: {}", next_candidate); next_peers.push(*next_candidate); } @@ -98,11 +98,11 @@ impl ReflectorSelector { if owd_recent.contains_key(&peer) { let rtt = (owd_recent[&peer].down_ewma + owd_recent[&peer].up_ewma) as u64; candidates.push((peer, rtt)); - info!("Candidate reflector: {} RTT: {}", peer.to_string(), rtt); + info!("Candidate reflector: {} RTT: {}", peer, rtt); } else { info!( "No data found from candidate reflector: {} - skipping", - peer.to_string() + peer ); } }