diff --git a/lighthouse/environment/src/tracing_common.rs b/lighthouse/environment/src/tracing_common.rs index ad9060a8ff8..893f50dae5d 100644 --- a/lighthouse/environment/src/tracing_common.rs +++ b/lighthouse/environment/src/tracing_common.rs @@ -3,7 +3,7 @@ use clap::ArgMatches; use logging::Libp2pDiscv5TracingLayer; use logging::{tracing_logging_layer::LoggingLayer, SSELoggingComponents}; use std::process; -use tracing_subscriber::filter::{EnvFilter, FilterFn, LevelFilter}; +use tracing_subscriber::filter::{FilterFn, LevelFilter}; use types::EthSpec; pub fn construct_logger( @@ -12,7 +12,6 @@ pub fn construct_logger( environment_builder: EnvironmentBuilder, ) -> ( EnvironmentBuilder, - EnvFilter, Libp2pDiscv5TracingLayer, LoggingLayer, LoggingLayer, @@ -32,16 +31,11 @@ pub fn construct_logger( let (builder, file_logging_layer, stdout_logging_layer, sse_logging_layer_opt) = environment_builder.init_tracing(logger_config.clone(), logfile_prefix); - let filter_layer = EnvFilter::try_from_default_env() - .or_else(|_| EnvFilter::try_new(logger_config.debug_level.to_string().to_lowercase())) - .unwrap(); - let dependency_log_filter = FilterFn::new(filter_dependency_log as fn(&tracing::Metadata<'_>) -> bool); ( builder, - filter_layer, libp2p_discv5_layer, file_logging_layer, stdout_logging_layer, diff --git a/lighthouse/src/main.rs b/lighthouse/src/main.rs index 8df48315030..a2432e282df 100644 --- a/lighthouse/src/main.rs +++ b/lighthouse/src/main.rs @@ -592,7 +592,6 @@ fn run( let ( builder, - filter_layer, libp2p_discv5_layer, file_logging_layer, stdout_logging_layer, @@ -622,7 +621,6 @@ fn run( let logging = tracing_subscriber::registry() .with(dependency_log_filter) - .with(filter_layer) .with(file_logging_layer.with_filter(logger_config.logfile_debug_level)) .with(stdout_logging_layer.with_filter(logger_config.debug_level)) .with(MetricsLayer) diff --git a/testing/simulator/src/basic_sim.rs b/testing/simulator/src/basic_sim.rs index fff5c71a872..4cd599f845b 100644 --- a/testing/simulator/src/basic_sim.rs +++ b/testing/simulator/src/basic_sim.rs @@ -90,7 +90,6 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> { let ( env_builder, - filter_layer, _libp2p_discv5_layer, file_logging_layer, stdout_logging_layer, @@ -119,7 +118,6 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> { ); if let Err(e) = tracing_subscriber::registry() - .with(filter_layer) .with(file_logging_layer.with_filter(logger_config.logfile_debug_level)) .with(stdout_logging_layer.with_filter(logger_config.debug_level)) .with(MetricsLayer) diff --git a/testing/simulator/src/fallback_sim.rs b/testing/simulator/src/fallback_sim.rs index 98a6a34ffa3..384699c64cf 100644 --- a/testing/simulator/src/fallback_sim.rs +++ b/testing/simulator/src/fallback_sim.rs @@ -94,7 +94,6 @@ pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> { let ( env_builder, - filter_layer, libp2p_discv5_layer, file_logging_layer, stdout_logging_layer, @@ -124,7 +123,6 @@ pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> { if let Err(e) = tracing_subscriber::registry() .with(dependency_log_filter) - .with(filter_layer) .with(file_logging_layer.with_filter(logger_config.logfile_debug_level)) .with(stdout_logging_layer.with_filter(logger_config.debug_level)) .with(libp2p_discv5_layer)