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

Duplicate logging to stdout #8495

Merged
arkpar merged 2 commits into from
Mar 31, 2021
Merged

Duplicate logging to stdout #8495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf496a
Duplicate logging to stdout
arkpar Mar 30, 2021
5291d29
Update client/tracing/src/logging/event_format.rs
arkpar Mar 30, 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
16 changes: 15 additions & 1 deletion client/tracing/src/logging/event_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ pub struct EventFormat<T = SystemTime> {
pub display_thread_name: bool,
/// Enable ANSI terminal colors for formatted output.
pub enable_color: bool,
/// Duplicate INFO, WARN and ERROR messages to stdout.
pub dup_to_stdout: bool,
}

impl<T> EventFormat<T>
Expand Down Expand Up @@ -123,7 +125,19 @@ where
writer: &mut dyn fmt::Write,
event: &Event,
) -> fmt::Result {
self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
if self.dup_to_stdout && (
event.metadata().level() == &Level::INFO ||
event.metadata().level() == &Level::WARN ||
event.metadata().level() == &Level::ERROR
) {
let mut out = String::new();
Copy link
Contributor

@cecton cecton Mar 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in tracing they tried to avoid re-allocation using lazy_static. Probably for performance reasons... 🤔 but I can't find the code anymore

Copy link
Contributor

@cecton cecton Mar 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found it, it is thread_local: https://github.com/tokio-rs/tracing/blob/master/tracing-subscriber/src/fmt/fmt_subscriber.rs#L674

Copy link
Contributor

@cecton cecton Mar 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Maybe it's not relevant here I don't know)

Copy link
Member Author

@arkpar arkpar Mar 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The string will only be allocated in the specific use case and only for INFO|WAR|ERROR messages that are rare. So I wouldn't bother.

self.format_event_custom(CustomFmtContext::FmtContext(ctx), &mut out, event)?;
writer.write_str(&out)?;
print!("{}", out);
Ok(())
} else {
self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions client/tracing/src/logging/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ where
display_level: !simple,
display_thread_name: !simple,
enable_color,
dup_to_stdout: !atty::is(atty::Stream::Stderr) && atty::is(atty::Stream::Stdout),
};
let builder = FmtSubscriber::builder().with_env_filter(env_filter);

Expand Down