From d8e4c8d24d994f3bb8caa4b36656774233d49ef1 Mon Sep 17 00:00:00 2001 From: Dave Hrycyszyn Date: Mon, 16 Mar 2020 13:22:15 +0000 Subject: [PATCH] Extracting logging setup for all binaries --- mixnode/src/main.rs | 36 +++++++++++++++++++----------------- nym-client/src/main.rs | 36 +++++++++++++++++++----------------- sfw-provider/src/main.rs | 36 +++++++++++++++++++----------------- 3 files changed, 57 insertions(+), 51 deletions(-) diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs index dddc15994b..d6da4731dd 100644 --- a/mixnode/src/main.rs +++ b/mixnode/src/main.rs @@ -7,23 +7,7 @@ mod node; fn main() { dotenv::dotenv().ok(); - - let mut log_builder = pretty_env_logger::formatted_timed_builder(); - if let Ok(s) = ::std::env::var("RUST_LOG") { - log_builder.parse_filters(&s); - } else { - // default to 'Info' - log_builder.filter(None, log::LevelFilter::Info); - } - - log_builder - .filter_module("hyper", log::LevelFilter::Warn) - .filter_module("tokio_reactor", log::LevelFilter::Warn) - .filter_module("reqwest", log::LevelFilter::Warn) - .filter_module("mio", log::LevelFilter::Warn) - .filter_module("want", log::LevelFilter::Warn) - .init(); - + setup_logging(); println!("{}", banner()); let arg_matches = App::new("Nym Mixnode") @@ -65,3 +49,21 @@ fn banner() -> String { built_info::PKG_VERSION ) } + +fn setup_logging() { + let mut log_builder = pretty_env_logger::formatted_timed_builder(); + if let Ok(s) = ::std::env::var("RUST_LOG") { + log_builder.parse_filters(&s); + } else { + // default to 'Info' + log_builder.filter(None, log::LevelFilter::Info); + } + + log_builder + .filter_module("hyper", log::LevelFilter::Warn) + .filter_module("tokio_reactor", log::LevelFilter::Warn) + .filter_module("reqwest", log::LevelFilter::Warn) + .filter_module("mio", log::LevelFilter::Warn) + .filter_module("want", log::LevelFilter::Warn) + .init(); +} diff --git a/nym-client/src/main.rs b/nym-client/src/main.rs index 89be581e02..114832670f 100644 --- a/nym-client/src/main.rs +++ b/nym-client/src/main.rs @@ -8,23 +8,7 @@ pub mod sockets; fn main() { dotenv::dotenv().ok(); - - let mut log_builder = pretty_env_logger::formatted_timed_builder(); - if let Ok(s) = ::std::env::var("RUST_LOG") { - log_builder.parse_filters(&s); - } else { - // default to 'Info' - log_builder.filter(None, log::LevelFilter::Info); - } - - log_builder - .filter_module("hyper", log::LevelFilter::Warn) - .filter_module("tokio_reactor", log::LevelFilter::Warn) - .filter_module("reqwest", log::LevelFilter::Warn) - .filter_module("mio", log::LevelFilter::Warn) - .filter_module("want", log::LevelFilter::Warn) - .init(); - + setup_logging(); println!("{}", banner()); let arg_matches = App::new("Nym Client") @@ -66,3 +50,21 @@ fn banner() -> String { built_info::PKG_VERSION ) } + +fn setup_logging() { + let mut log_builder = pretty_env_logger::formatted_timed_builder(); + if let Ok(s) = ::std::env::var("RUST_LOG") { + log_builder.parse_filters(&s); + } else { + // default to 'Info' + log_builder.filter(None, log::LevelFilter::Info); + } + + log_builder + .filter_module("hyper", log::LevelFilter::Warn) + .filter_module("tokio_reactor", log::LevelFilter::Warn) + .filter_module("reqwest", log::LevelFilter::Warn) + .filter_module("mio", log::LevelFilter::Warn) + .filter_module("want", log::LevelFilter::Warn) + .init(); +} diff --git a/sfw-provider/src/main.rs b/sfw-provider/src/main.rs index f466261f60..7b6632776a 100644 --- a/sfw-provider/src/main.rs +++ b/sfw-provider/src/main.rs @@ -7,23 +7,7 @@ pub mod provider; fn main() { dotenv::dotenv().ok(); - - let mut log_builder = pretty_env_logger::formatted_timed_builder(); - if let Ok(s) = ::std::env::var("RUST_LOG") { - log_builder.parse_filters(&s); - } else { - // default to 'Info' - log_builder.filter(None, log::LevelFilter::Info); - } - - log_builder - .filter_module("hyper", log::LevelFilter::Warn) - .filter_module("tokio_reactor", log::LevelFilter::Warn) - .filter_module("reqwest", log::LevelFilter::Warn) - .filter_module("mio", log::LevelFilter::Warn) - .filter_module("want", log::LevelFilter::Warn) - .init(); - + setup_logging(); println!("{}", banner()); let arg_matches = App::new("Nym Service Provider") @@ -65,3 +49,21 @@ fn banner() -> String { built_info::PKG_VERSION ) } + +fn setup_logging() { + let mut log_builder = pretty_env_logger::formatted_timed_builder(); + if let Ok(s) = ::std::env::var("RUST_LOG") { + log_builder.parse_filters(&s); + } else { + // default to 'Info' + log_builder.filter(None, log::LevelFilter::Info); + } + + log_builder + .filter_module("hyper", log::LevelFilter::Warn) + .filter_module("tokio_reactor", log::LevelFilter::Warn) + .filter_module("reqwest", log::LevelFilter::Warn) + .filter_module("mio", log::LevelFilter::Warn) + .filter_module("want", log::LevelFilter::Warn) + .init(); +}