fix: even more logging

crates/session/src/connection_quality.rs

@@ -1,5 +1,5 @@
+use core::fmt;
 use std::time::Instant;
-use log::trace;
 
 use crate::metrics::RateMetrics;
 
@@ -17,16 +17,25 @@ pub enum QualityAssessment {
 pub struct ConnectionQuality {
     pub last_ping_at: Instant,
     pub pings_per_second: RateMetrics,
+    pub last_pings_per_second: f32,
     pub assessment: QualityAssessment,
     threshold: f32,
 }
 
+
+impl fmt::Display for ConnectionQuality {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "[quality pings_per_second:{} assessment: {:?}]", self.last_pings_per_second, self.assessment)
+    }
+}
+
 impl ConnectionQuality {
     pub fn new(threshold: f32, time: Instant) -> Self {
         Self {
             assessment: QualityAssessment::NeedMoreInformation,
             last_ping_at: Instant::now(),
             pings_per_second: RateMetrics::new(time),
+            last_pings_per_second: 0.0,
             threshold,
         }
     }
@@ -40,15 +49,15 @@ impl ConnectionQuality {
         if !self.pings_per_second.has_enough_time_passed(time) {
             self.assessment = QualityAssessment::NeedMoreInformation;
         } else {
-            let pings_per_second = self.pings_per_second.calculate_rate(time);
-            self.assessment = if pings_per_second < self.threshold {
+            self.last_pings_per_second = self.pings_per_second.calculate_rate(time);
+            self.assessment = if self.last_pings_per_second < self.threshold {
                 QualityAssessment::RecommendDisconnect
-            } else if pings_per_second > self.threshold * 2.0 {
+            } else if self.last_pings_per_second > self.threshold * 2.0 {
                 QualityAssessment::Good
             } else {
                 QualityAssessment::Acceptable
             };
-            trace!("pings_per_second {}, assessment {:?}", pings_per_second, self.assessment);
+
         }
     }
 }

crates/session/src/lib.rs

@@ -7,6 +7,8 @@
 //! Evaluating connection quality for all connections attached to the room. Using "votes" from the connections, together with
 //! [Knowledge] and [ConnectionQuality] it determines which connection should be appointed leader.
 
+extern crate core;
+
 use core::fmt;
 use std::collections::HashMap;
 use std::time::{Duration, Instant};
@@ -64,7 +66,7 @@ pub struct Connection {
 
 impl fmt::Display for Connection {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "[conn id:{} knowledge:{} connectedToHost:{:?} knownTerm:{:?}]", self.id, self.knowledge, self.has_connection_host, self.last_reported_term)
+        write!(f, "[conn id:{}, knowledge:{}, connectedToHost:{:?}, knownTerm:{:?}, quality:{}]", self.id, self.knowledge, self.has_connection_host, self.last_reported_term, self.quality)
     }
 }
 
@@ -99,6 +101,7 @@ impl Connection {
 
     fn update(&mut self, time: Instant) {
         self.quality.update(time);
+        trace!("update {}", self);
     }
 
     pub fn assessment(&self) -> QualityAssessment {
@@ -417,10 +420,10 @@ impl Room {
 
 #[cfg(test)]
 mod tests {
-    use test_log::test;
-
     use std::time::{Duration, Instant};
 
+    use test_log::test;
+
     use conclave_types::{ConnectionToLeader, Knowledge, Term};
 
     use crate::{QualityAssessment, Room, RoomConfig};