From 60dac9ea17644b764c109882e178dee6d58c7652 Mon Sep 17 00:00:00 2001 From: shimunn <> Date: Thu, 23 May 2019 20:23:05 +0200 Subject: [PATCH] added option to supress Transfer logging --- wg-event-gen/src/listener.rs | 18 +++++++++++++++--- wg-event-gen/src/main.rs | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/wg-event-gen/src/listener.rs b/wg-event-gen/src/listener.rs index 45ac656..1c98a90 100644 --- a/wg-event-gen/src/listener.rs +++ b/wg-event-gen/src/listener.rs @@ -1,5 +1,6 @@ use crate::Peer; use number_prefix::{NumberPrefix, Prefixed, Standalone}; +use std::env; use std::net::SocketAddr; use std::path::PathBuf; use std::process::Command; @@ -33,7 +34,18 @@ impl EventListener for Vec> { } } -pub struct LogListener; +pub struct LogListener { + log_transfer: bool, +} + +impl Default for LogListener { + fn default() -> LogListener { + let log = env::var("WG_LOG_TRANSFER") + .map(|t| t.parse::().unwrap_or(true)) + .unwrap_or(false); + LogListener { log_transfer: log } + } +} impl EventListener for LogListener { fn name(&self) -> &'static str { @@ -52,7 +64,7 @@ impl EventListener for LogListener { previous_addr, peer.endpoint.unwrap() ), - Event::Transfered { peer, tx, rx } => { + Event::Transfered { peer, tx, rx } if self.log_transfer => { let prefix = |cnt: u64| match NumberPrefix::binary(cnt as f64) { Standalone(bytes) => format!("{}B", bytes), Prefixed(prefix, n) => format!("{:.0} {}B", n, prefix), @@ -64,7 +76,7 @@ impl EventListener for LogListener { prefix(rx) ); } - + Event::Transfered { peer, tx, rx } => (), _ => unimplemented!(), } } diff --git a/wg-event-gen/src/main.rs b/wg-event-gen/src/main.rs index b4cb42c..f6c268e 100644 --- a/wg-event-gen/src/main.rs +++ b/wg-event-gen/src/main.rs @@ -29,7 +29,7 @@ fn listeners(opts: &Opts) -> Vec> { listeners.push(Box::new(ScriptListener::new(events))) } if opts.log { - listeners.push(Box::new(LogListener)); + listeners.push(Box::new(LogListener::default())); } println!("Enabled handlers: {}", (&listeners.iter().map(|l| l.name()).collect::>()).join(", ")); listeners