|
|
@@ -34,38 +34,39 @@ use crate::{
|
|
|
P2p, Settings,
|
|
|
},
|
|
|
system::sleep,
|
|
|
+ util::logger::{setup_test_logger, Level},
|
|
|
};
|
|
|
|
|
|
fn init_logger() {
|
|
|
- let mut cfg = simplelog::ConfigBuilder::new();
|
|
|
- cfg.add_filter_ignore("sled".to_string());
|
|
|
- cfg.add_filter_ignore("net::protocol_ping".to_string());
|
|
|
- cfg.add_filter_ignore("net::channel::subscribe_stop()".to_string());
|
|
|
- cfg.add_filter_ignore("net::hosts".to_string());
|
|
|
- cfg.add_filter_ignore("net::session".to_string());
|
|
|
- cfg.add_filter_ignore("net::outbound_session".to_string());
|
|
|
- cfg.add_filter_ignore("net::inbound_session".to_string());
|
|
|
- cfg.add_filter_ignore("net::message_publisher".to_string());
|
|
|
- cfg.add_filter_ignore("net::protocol_address".to_string());
|
|
|
- cfg.add_filter_ignore("net::protocol_version".to_string());
|
|
|
- cfg.add_filter_ignore("net::protocol_registry".to_string());
|
|
|
- cfg.add_filter_ignore("net::protocol_jobs_manager".to_string());
|
|
|
- cfg.add_filter_ignore("net::channel::send()".to_string());
|
|
|
- cfg.add_filter_ignore("net::channel::start()".to_string());
|
|
|
- cfg.add_filter_ignore("net::channel::handle_stop()".to_string());
|
|
|
- cfg.add_filter_ignore("net::channel::subscribe_msg()".to_string());
|
|
|
- cfg.add_filter_ignore("net::channel::main_receive_loop()".to_string());
|
|
|
- cfg.add_filter_ignore("net::tcp".to_string());
|
|
|
-
|
|
|
+ let ignored_targets = [
|
|
|
+ "sled",
|
|
|
+ "net::protocol_ping",
|
|
|
+ "net::channel::subscribe_stop()",
|
|
|
+ "net::hosts",
|
|
|
+ "net::session",
|
|
|
+ "net::outbound_session",
|
|
|
+ "net::inbound_session",
|
|
|
+ "net::message_publisher",
|
|
|
+ "net::protocol_address",
|
|
|
+ "net::protocol_version",
|
|
|
+ "net::protocol_registry",
|
|
|
+ "net::protocol_jobs_manager",
|
|
|
+ "net::channel::send()",
|
|
|
+ "net::channel::start()",
|
|
|
+ "net::channel::handle_stop()",
|
|
|
+ "net::channel::subscribe_msg()",
|
|
|
+ "net::channel::main_receive_loop()",
|
|
|
+ "net::tcp",
|
|
|
+ ];
|
|
|
// We check this error so we can execute same file tests in parallel,
|
|
|
// otherwise second one fails to init logger here.
|
|
|
- if simplelog::TermLogger::init(
|
|
|
- simplelog::LevelFilter::Info,
|
|
|
- //simplelog::LevelFilter::Debug,
|
|
|
- //simplelog::LevelFilter::Trace,
|
|
|
- cfg.build(),
|
|
|
- simplelog::TerminalMode::Mixed,
|
|
|
- simplelog::ColorChoice::Auto,
|
|
|
+ if setup_test_logger(
|
|
|
+ &ignored_targets,
|
|
|
+ false,
|
|
|
+ //Level::Info,
|
|
|
+ Level::Verbose,
|
|
|
+ //Level::Debug,
|
|
|
+ //Level::Trace,
|
|
|
)
|
|
|
.is_err()
|
|
|
{
|