This commit is contained in:
Alexey Shekhirin
2023-12-11 19:08:31 +00:00
committed by GitHub
parent fa1584b223
commit 4cda40b3cf

View File

@ -232,27 +232,20 @@ impl Logs {
{
let mut layers = Vec::new();
// Function to create a new EnvFilter with environment, default and additional directive
let create_env_filter = |additional_directive: &str| -> eyre::Result<EnvFilter> {
Ok(EnvFilter::builder()
.from_env_lossy()
.add_directive(DEFAULT_ENV_FILTER_DIRECTIVE.parse()?)
.add_directive(additional_directive.parse()?))
};
// Create and add the journald layer if enabled
if self.journald {
let journald_filter = create_env_filter(&self.journald_filter)?;
layers.push(
reth_tracing::journald(journald_filter).expect("Could not connect to journald"),
reth_tracing::journald(
EnvFilter::try_new(DEFAULT_ENV_FILTER_DIRECTIVE)?
.add_directive(self.journald_filter.parse()?),
)
.expect("Could not connect to journald"),
);
}
// Create and add the file logging layer if enabled
let file_guard = if self.log_file_max_files > 0 {
let file_filter = create_env_filter(&self.log_file_filter)?;
let (layer, guard) = reth_tracing::file(
file_filter,
EnvFilter::try_new(DEFAULT_ENV_FILTER_DIRECTIVE)?
.add_directive(self.log_file_filter.parse()?),
&self.log_file_directory,
"reth.log",
self.log_file_max_size * MB_TO_BYTES,