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.
This commit is contained in:
3 files changed
+14
-10
No files matched your search
+3
-3
@@ -4,7 +4,7 @@ use crate::metrics::{Metric, MetricsSender};
|
|||||||
use crate::pinger::PingReply;
|
use crate::pinger::PingReply;
|
||||||
use crate::util::ArcMutex;
|
use crate::util::ArcMutex;
|
||||||
use crate::util::MutexExt;
|
use crate::util::MutexExt;
|
||||||
use log::info;
|
use log::{debug, info};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
use std::sync::atomic::Ordering;
|
use std::sync::atomic::Ordering;
|
||||||
@@ -147,11 +147,11 @@ impl Baseliner {
|
|||||||
recent_down_ewma: owd_recent.down_ewma,
|
recent_down_ewma: owd_recent.down_ewma,
|
||||||
});
|
});
|
||||||
|
|
||||||
info!(
|
debug!(
|
||||||
"Reflector {} up baseline = {} down baseline = {}",
|
"Reflector {} up baseline = {} down baseline = {}",
|
||||||
time_data.reflector, owd_baseline.up_ewma, owd_baseline.down_ewma
|
time_data.reflector, owd_baseline.up_ewma, owd_baseline.down_ewma
|
||||||
);
|
);
|
||||||
info!(
|
debug!(
|
||||||
"Reflector {} up recent = {} down recent = {}",
|
"Reflector {} up recent = {} down recent = {}",
|
||||||
time_data.reflector, owd_recent.up_ewma, owd_recent.down_ewma
|
time_data.reflector, owd_recent.up_ewma, owd_recent.down_ewma
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -235,7 +235,11 @@ impl Ratecontroller {
|
|||||||
|
|
||||||
if state_dl.deltas.len() < 5 || state_ul.deltas.len() < 5 {
|
if state_dl.deltas.len() < 5 || state_ul.deltas.len() < 5 {
|
||||||
// trigger reselection
|
// 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);
|
let _ = self.reselect_trigger.send(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -390,8 +394,8 @@ impl Ratecontroller {
|
|||||||
|| self.state_ul.next_rate != self.state_ul.current_rate
|
|| self.state_ul.next_rate != self.state_ul.current_rate
|
||||||
{
|
{
|
||||||
info!(
|
info!(
|
||||||
"self.state_ul.next_rate {} self.state_dl.next_rate {}",
|
"Adjusting rates (D/U): {} / {} kbit/s",
|
||||||
self.state_ul.next_rate, self.state_dl.next_rate
|
self.state_dl.next_rate as u64, self.state_ul.next_rate as u64
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ impl ReflectorSelector {
|
|||||||
|
|
||||||
// Include all current peers
|
// Include all current peers
|
||||||
for reflector in reflectors_peers.iter() {
|
for reflector in reflectors_peers.iter() {
|
||||||
debug!("Current peer: {}", reflector.to_string());
|
debug!("Current peer: {}", reflector);
|
||||||
next_peers.push(*reflector);
|
next_peers.push(*reflector);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ impl ReflectorSelector {
|
|||||||
if next_peers.contains(next_candidate) {
|
if next_peers.contains(next_candidate) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
debug!("Next candidate: {}", next_candidate.to_string());
|
debug!("Next candidate: {}", next_candidate);
|
||||||
next_peers.push(*next_candidate);
|
next_peers.push(*next_candidate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,11 +98,11 @@ impl ReflectorSelector {
|
|||||||
if owd_recent.contains_key(&peer) {
|
if owd_recent.contains_key(&peer) {
|
||||||
let rtt = (owd_recent[&peer].down_ewma + owd_recent[&peer].up_ewma) as u64;
|
let rtt = (owd_recent[&peer].down_ewma + owd_recent[&peer].up_ewma) as u64;
|
||||||
candidates.push((peer, rtt));
|
candidates.push((peer, rtt));
|
||||||
info!("Candidate reflector: {} RTT: {}", peer.to_string(), rtt);
|
info!("Candidate reflector: {} RTT: {}", peer, rtt);
|
||||||
} else {
|
} else {
|
||||||
info!(
|
info!(
|
||||||
"No data found from candidate reflector: {} - skipping",
|
"No data found from candidate reflector: {} - skipping",
|
||||||
peer.to_string()
|
peer
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user