From 8e68c5c90cf303c82f9a74c4b0547c544d37e136 Mon Sep 17 00:00:00 2001
From: shimunn <>
Date: Wed, 3 Apr 2019 20:20:08 +0200
Subject: [PATCH] more logging output [CI SKIP]

---
 wg-event-gen/src/listener.rs | 12 ++++++++++++
 wg-event-gen/src/main.rs     | 25 +++----------------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/wg-event-gen/src/listener.rs b/wg-event-gen/src/listener.rs
index 7b0f994..d9d6e10 100644
--- a/wg-event-gen/src/listener.rs
+++ b/wg-event-gen/src/listener.rs
@@ -6,6 +6,8 @@ use std::thread;
 use std::time::SystemTime;
 
 pub trait EventListener {
+    fn name(&self) -> &'static str;
+
     fn added<'a>(&self, peer: &'a Peer) {
         self.connected(peer);
     }
@@ -22,6 +24,10 @@ pub trait EventListener {
 }
 
 impl EventListener for Vec<Box<EventListener>> {
+    fn name(&self) -> &'static str {
+        "List of Listeners"
+    }
+
     fn added<'a>(&self, peer: &'a Peer) {
         if cfg!(feature = "addrem") || cfg!(test) {
             self.iter().for_each(|l| l.added(&peer));
@@ -50,6 +56,9 @@ impl EventListener for Vec<Box<EventListener>> {
 pub struct LogListener;
 
 impl EventListener for LogListener {
+    fn name(&self) -> &'static str {
+        "Log"
+    }
     fn connected<'a>(&self, peer: &'a Peer) {
         println!("{} connected!", peer.key);
     }
@@ -134,6 +143,9 @@ impl ScriptListener {
 }
 
 impl EventListener for ScriptListener {
+    fn name(&self) -> &'static str {
+        "Script"
+    }
     fn connected<'a>(&self, peer: &'a Peer) {
         self.call_sub(vec!["connected", &self.peer_props(peer)]);
     }
diff --git a/wg-event-gen/src/main.rs b/wg-event-gen/src/main.rs
index 609a9ee..b4cb42c 100644
--- a/wg-event-gen/src/main.rs
+++ b/wg-event-gen/src/main.rs
@@ -31,6 +31,7 @@ fn listeners(opts: &Opts) -> Vec<Box<EventListener>> {
     if opts.log {
         listeners.push(Box::new(LogListener));
     }
+    println!("Enabled handlers: {}", (&listeners.iter().map(|l| l.name()).collect::<Vec<_>>()).join(", "));
     listeners
 }
 
@@ -47,7 +48,6 @@ fn main() -> io::Result<()> {
         interval
     );
     let mut peers_last: Option<HashMap<ECCKey, Peer>> = None;
-    let start = SystemTime::now();
     loop {
         let now = Instant::now();
         let peers = match controller.peers() {
@@ -61,29 +61,10 @@ fn main() -> io::Result<()> {
             }
             res => res?,
         };
-        /*println!("Connected peers:");
-        for peer in peers {
-            let peer = peer?;
-            if peer
-                .last_handshake
-                .map(|h| h.elapsed().unwrap() < timeout)
-                .unwrap_or(false)
-            {
-                println!("/\\{:?}  {}",(timeout - peer.last_handshake.unwrap().elapsed().unwrap()), peer);
-            }
-        }*/
         let peers = peers
             .map(|peer| peer.map(|peer_ok| (peer_ok.key.clone(), peer_ok)))
             .collect::<io::Result<HashMap<_, _>>>()?;
-        for (k, p) in peers.iter() {
-            if let Some(shake) = p.last_handshake {
-                println!(
-                    "{} {:?}",
-                    k.to_string()[0..5].to_string(),
-                    shake.duration_since(start).unwrap()
-                );
-            }
-        }
+
         if let Some(ref mut peers_last) = peers_last {
             gen_events(&peers, &peers_last, &listeners, timeout, interval);
 
@@ -92,7 +73,7 @@ fn main() -> io::Result<()> {
             peers_last = Some(peers);
         }
         let pause = interval - now.elapsed();
-        dbg!(interval - pause);
+
         sleep(if pause > interval / 2 {
             pause
         } else {