Skip to content

Fix RUST_LOG implementation by using default directive #331

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

Merged
kp-mariappan-ramasamy merged 1 commit into from
Dec 16, 2025
Merged

Fix RUST_LOG implementation by using default directive #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions lightway-client/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,14 @@ async fn main() -> Result<()> {
Layer::Clap(matches),
])?;

let level: tracing::level_filters::LevelFilter = config.log_level.into();
let filter = tracing_subscriber::EnvFilter::builder()
.with_default_directive(level.into())
// https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.Builder.html#method.with_regex
// recommends to disable REGEX when using envfilter from untrusted sources
.with_regex(false)
.from_env()
.unwrap_or_else(|_| {
// If RUST_LOG is not set, use config.log_level as default
let level: tracing::level_filters::LevelFilter = config.log_level.into();
tracing_subscriber::EnvFilter::new(level.to_string())
});
.with_env_var("LW_CLIENT_RUST_LOG")
.from_env_lossy();
let fmt = tracing_subscriber::fmt().with_env_filter(filter);

LogFormat::Full.init_with_env_filter(fmt);
Expand Down
10 changes: 4 additions & 6 deletions lightway-server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,14 @@ async fn main() -> Result<()> {
set_logging_callback(Some(wolfssl_tracing_callback));
}

let level: tracing::level_filters::LevelFilter = config.log_level.into();
let filter = tracing_subscriber::EnvFilter::builder()
.with_default_directive(level.into())
// https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.Builder.html#method.with_regex
// recommends to disable REGEX when using envfilter from untrusted sources
.with_regex(false)
.from_env()
.unwrap_or_else(|_| {
// If RUST_LOG is not set, use config.log_level as default
let level: tracing::level_filters::LevelFilter = config.log_level.into();
tracing_subscriber::EnvFilter::new(level.to_string())
});
.with_env_var("LW_SERVER_RUST_LOG")
.from_env_lossy();
let fmt = tracing_subscriber::fmt().with_env_filter(filter);

config.log_format.init_with_env_filter(fmt);
Expand Down
Loading