From 7aec385f14f75f1b9d49c5f585ddcf8a76ef2fce Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 12 Oct 2020 16:13:17 +0100 Subject: [PATCH 1/2] Add profiling targets to tracing_subscriber --- client/cli/src/lib.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index dd96cdd7836ab..d776d942fbc5a 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -234,7 +234,7 @@ pub trait SubstrateCli: Sized { pub fn init_logger( pattern: &str, tracing_receiver: sc_tracing::TracingReceiver, - tracing_targets: Option, + profiling_targets: Option, ) -> std::result::Result<(), String> { fn parse_directives(dirs: impl AsRef) -> Vec { dirs.as_ref() @@ -293,6 +293,13 @@ pub fn init_logger( .expect("provided directive is valid"), ); + // Make sure we include profiling targets in the filter + if let Some(profiling_targets) = profiling_targets.clone() { + for directive in parse_directives(profiling_targets) { + env_filter = env_filter.add_directive(directive); + } + } + let isatty = atty::is(atty::Stream::Stderr); let enable_color = isatty; let timer = ChronoLocal::with_format(if simple { @@ -311,8 +318,8 @@ pub fn init_logger( .with_writer(std::io::stderr) .finish(); - if let Some(tracing_targets) = tracing_targets { - let profiling = sc_tracing::ProfilingLayer::new(tracing_receiver, &tracing_targets); + if let Some(profiling_targets) = profiling_targets { + let profiling = sc_tracing::ProfilingLayer::new(tracing_receiver, &profiling_targets); if let Err(e) = tracing::subscriber::set_global_default(subscriber.with(profiling)) { return Err(format!( From 02d739e370fc4552d83498199058fa90df40db95 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 12 Oct 2020 22:36:15 +0100 Subject: [PATCH 2/2] comment --- client/cli/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index d776d942fbc5a..b7d11f68df08e 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -293,7 +293,7 @@ pub fn init_logger( .expect("provided directive is valid"), ); - // Make sure we include profiling targets in the filter + // Make sure to include profiling targets in the filter if let Some(profiling_targets) = profiling_targets.clone() { for directive in parse_directives(profiling_targets) { env_filter = env_filter.add_directive(directive);