Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Doc fixes for sc-telemetry & API struct rename #7934

Merged
11 commits merged into from
Jan 29, 2021
Merged

Doc fixes for sc-telemetry & API struct rename #7934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26c5ad4
Doc fixes for sc-telemetry
cecton Jan 20, 2021
338c3bd
Fix flag to disable log reloading
cecton Jan 20, 2021
9af21dd
Forgot to reverse the conditions
cecton Jan 20, 2021
fd8bbec
Apply suggestion
cecton Jan 20, 2021
3d07bed
Rename pattern to directives
cecton Jan 20, 2021
f26a828
Rename GlobalLoggerBuilder to LoggerBuilder
cecton Jan 21, 2021
5efdec6
Return instead of expect
cecton Jan 22, 2021
cb2cde9
Use transparent outside the enum
cecton Jan 22, 2021
daa6021
Update client/tracing/src/logging/directives.rs
cecton Jan 27, 2021
7c5913c
Merge commit 0b0d124d5f9be89f614f2be8e9da038fcb9f540e (no conflict)
cecton Jan 27, 2021
f4d9f61
Merge commit 68d715719add5ed0473585f8ce38dd312a69a063 (no conflict)
cecton Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestion
  • Loading branch information
@cecton
cecton committed Jan 20, 2021
commit fd8bbeca63ab8061b029406b8d28aed833841fcc
2 changes: 1 addition & 1 deletion client/tracing/src/logging/directives.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub(crate) fn set_reload_handle(handle: Handle<EnvFilter, SCSubscriber>) {
let _ = FILTER_RELOAD_HANDLE.set(handle);
}

// The layered Subscriber as built up in `init_logger()`.
// The layered Subscriber as built up in `GlobalLogger::init()`.
// Used in the reload `Handle`.
type SCSubscriber<
N = tracing_fmt::format::DefaultFields,
Expand Down
10 changes: 5 additions & 5 deletions client/tracing/src/logging/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ macro_rules! enable_log_reloading {
}

/// Common implementation to get the subscriber.
fn get_subscriber_internal<N, E, F, W>(
fn prepare_subscriber<N, E, F, W>(
pattern: &str,
max_level: Option<log::LevelFilter>,
force_colors: Option<bool>,
Expand Down Expand Up @@ -261,7 +261,7 @@ impl GlobalLoggerBuilder {
let max_level = Some(log::LevelFilter::Trace);

if self.log_reloading {
let (subscriber, telemetry_worker) = get_subscriber_internal(
let (subscriber, telemetry_worker) = prepare_subscriber(
&format!("{},{},sc_tracing=trace", self.pattern, profiling_targets),
max_level,
self.force_colors,
Expand All @@ -275,7 +275,7 @@ impl GlobalLoggerBuilder {

Ok(telemetry_worker)
} else {
let (subscriber, telemetry_worker) = get_subscriber_internal(
let (subscriber, telemetry_worker) = prepare_subscriber(
&format!("{},{},sc_tracing=trace", self.pattern, profiling_targets),
max_level,
self.force_colors,
Expand All @@ -291,7 +291,7 @@ impl GlobalLoggerBuilder {
}
} else {
if self.log_reloading {
let (subscriber, telemetry_worker) = get_subscriber_internal(
let (subscriber, telemetry_worker) = prepare_subscriber(
&self.pattern,
None,
self.force_colors,
Expand All @@ -304,7 +304,7 @@ impl GlobalLoggerBuilder {

Ok(telemetry_worker)
} else {
let (subscriber, telemetry_worker) = get_subscriber_internal(
let (subscriber, telemetry_worker) = prepare_subscriber(
&self.pattern,
None,
self.force_colors,
Expand Down