Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(bin) enhance logging config to make RUST_LOG for journalId and File writers #5687

Merged
merged 7 commits into from
Dec 11, 2023
Merged

feat(bin) enhance logging config to make RUST_LOG for journalId and File writers #5687

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1d9939
RUST_LOG
DoTheBestToGetTheBest Dec 4, 2023
373133d
clippy + fmt
DoTheBestToGetTheBest Dec 4, 2023
ce44cfb
Update mod.rs
DoTheBestToGetTheBest Dec 4, 2023
35dfa75
Update mod.rs
DoTheBestToGetTheBest Dec 8, 2023
39fa5ca
one statement with builder pattern
DoTheBestToGetTheBest Dec 8, 2023
cecd6b0
fix comments
DoTheBestToGetTheBest Dec 8, 2023
b4af619
fmt
DoTheBestToGetTheBest Dec 8, 2023
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
21 changes: 14 additions & 7 deletions bin/reth/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,20 +232,27 @@ 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(
EnvFilter::try_new(DEFAULT_ENV_FILTER_DIRECTIVE)?
.add_directive(self.journald_filter.parse()?),
)
.expect("Could not connect to journald"),
reth_tracing::journald(journald_filter).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(
EnvFilter::try_new(DEFAULT_ENV_FILTER_DIRECTIVE)?
.add_directive(self.log_file_filter.parse()?),
file_filter,
&self.log_file_directory,
"reth.log",
self.log_file_max_size * MB_TO_BYTES,
Expand Down
Loading