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

Commit 70f1b61

Browse files
arkparbkchr
andauthored
Duplicate logging to stdout (#8495)
* Duplicate logging to stdout * Update client/tracing/src/logging/event_format.rs Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Bastian Köcher <[email protected]>
1 parent 3e96c69 commit 70f1b61

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

client/tracing/src/logging/event_format.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ pub struct EventFormat<T = SystemTime> {
4343
pub display_thread_name: bool,
4444
/// Enable ANSI terminal colors for formatted output.
4545
pub enable_color: bool,
46+
/// Duplicate INFO, WARN and ERROR messages to stdout.
47+
pub dup_to_stdout: bool,
4648
}
4749

4850
impl<T> EventFormat<T>
@@ -123,7 +125,19 @@ where
123125
writer: &mut dyn fmt::Write,
124126
event: &Event,
125127
) -> fmt::Result {
126-
self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
128+
if self.dup_to_stdout && (
129+
event.metadata().level() == &Level::INFO ||
130+
event.metadata().level() == &Level::WARN ||
131+
event.metadata().level() == &Level::ERROR
132+
) {
133+
let mut out = String::new();
134+
self.format_event_custom(CustomFmtContext::FmtContext(ctx), &mut out, event)?;
135+
writer.write_str(&out)?;
136+
print!("{}", out);
137+
Ok(())
138+
} else {
139+
self.format_event_custom(CustomFmtContext::FmtContext(ctx), writer, event)
140+
}
127141
}
128142
}
129143

client/tracing/src/logging/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ where
167167
display_level: !simple,
168168
display_thread_name: !simple,
169169
enable_color,
170+
dup_to_stdout: !atty::is(atty::Stream::Stderr) && atty::is(atty::Stream::Stdout),
170171
};
171172
let builder = FmtSubscriber::builder().with_env_filter(env_filter);
172173

0 commit comments

Comments
 (0)