cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Deprecate env_log flag in tracing layer (#5228)

Browse Source 
* deprecate terminal logs file in tracing layer

* sink writer
This commit is contained in:
Eitan Seri-Levi 2024-02-19 07:17:58 +02:00 committed by GitHub
parent c9702cb0a1
commit 4d625951b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/logging/src/lib.rs
View File

@ -223,7 +223,7 @@ impl TimeLatch {
} }
} }
pub fn create_tracing_layer(base_tracing_log_path: PathBuf, turn_on_terminal_logs: bool) { pub fn create_tracing_layer(base_tracing_log_path: PathBuf) {
let filter_layer = match tracing_subscriber::EnvFilter::try_from_default_env() let filter_layer = match tracing_subscriber::EnvFilter::try_from_default_env()
.or_else(|_| tracing_subscriber::EnvFilter::try_new("warn")) .or_else(|_| tracing_subscriber::EnvFilter::try_new("warn"))
{ {
@ -268,11 +268,7 @@ pub fn create_tracing_layer(base_tracing_log_path: PathBuf, turn_on_terminal_log
if let Err(e) = tracing_subscriber::fmt() if let Err(e) = tracing_subscriber::fmt()
.with_env_filter(filter_layer) .with_env_filter(filter_layer)
.with_writer(move || { .with_writer(std::io::sink)
tracing_subscriber::fmt::writer::OptionalWriter::<std::io::Stdout>::from(
turn_on_terminal_logs.then(std::io::stdout),
)
})
.finish() .finish()
.with(MetricsLayer) .with(MetricsLayer)
.with(custom_layer) .with(custom_layer)

4
lighthouse/src/main.rs
View File

@ -556,9 +556,7 @@ fn run<E: EthSpec>(
let path = tracing_log_path.clone().unwrap(); let path = tracing_log_path.clone().unwrap();
let turn_on_terminal_logs = matches.is_present("env_log"); logging::create_tracing_layer(path);
logging::create_tracing_layer(path, turn_on_terminal_logs);
// Allow Prometheus to export the time at which the process was started. // Allow Prometheus to export the time at which the process was started.
metrics::expose_process_start_time(&log); metrics::expose_process_start_time(&log);