Skip to content

Commit 4b00bbd

Browse files
committed
examples: remove use of EnvFilter entirely
1 parent 4c9500c commit 4b00bbd

File tree

4 files changed

+42
-12
lines changed

4 files changed

+42
-12
lines changed

stun-proto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ tracing.workspace = true
1818
thiserror.workspace = true
1919

2020
[dev-dependencies]
21-
tracing-subscriber = { version = "0.3", features = ["env-filter"]}
21+
tracing-subscriber = "0.3"

stun-proto/examples/stund.rs

+20-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ use std::io::{self, Read, Write};
1313
use std::net::{TcpListener, UdpSocket};
1414
use std::str::FromStr;
1515

16-
use tracing_subscriber::EnvFilter;
17-
1816
use tracing::{debug, error, info, warn};
1917

2018
use stun_types::attribute::*;
@@ -84,10 +82,27 @@ fn handle_incoming_data<'a>(
8482
}
8583
}
8684

85+
fn init_logs() {
86+
use tracing_subscriber::layer::SubscriberExt;
87+
use tracing_subscriber::Layer;
88+
let level_filter = std::env::var("STUN_LOG")
89+
.ok()
90+
.and_then(|var| var.parse::<tracing_subscriber::filter::Targets>().ok())
91+
.unwrap_or(tracing_subscriber::filter::Targets::new().with_default(tracing::Level::ERROR));
92+
let registry = tracing_subscriber::registry().with(
93+
tracing_subscriber::fmt::layer()
94+
.with_file(true)
95+
.with_line_number(true)
96+
.with_level(true)
97+
.with_target(false)
98+
.with_writer(std::io::stderr)
99+
.with_filter(level_filter),
100+
);
101+
tracing::subscriber::set_global_default(registry).unwrap()
102+
}
103+
87104
fn main() -> io::Result<()> {
88-
if let Ok(filter) = EnvFilter::try_from_default_env() {
89-
tracing_subscriber::fmt().with_env_filter(filter).init();
90-
}
105+
init_logs();
91106

92107
let args: Vec<String> = std::env::args().collect();
93108
let local_addr: SocketAddr = SocketAddr::from_str(if args.len() > 1 {

stun-types/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ arbitrary ={ workspace = true, optional = true }
2424
thiserror.workspace = true
2525

2626
[dev-dependencies]
27-
tracing-subscriber = { version = "0.3", features = ["env-filter"]}
27+
tracing-subscriber = "0.3"
2828

2929
[features]
3030
arbitrary = ["dep:arbitrary"]

stun-types/examples/stunclient.rs

+20-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ use std::net::{SocketAddr, UdpSocket};
1313
use std::process::exit;
1414
use std::str::FromStr;
1515

16-
use tracing_subscriber::EnvFilter;
17-
1816
use tracing::{info, trace};
1917

2018
use stun_types::attribute::*;
@@ -115,10 +113,27 @@ fn udp_message(out: MessageBuilder<'_>, to: SocketAddr) -> Result<(), std::io::E
115113
parse_response(msg)
116114
}
117115

116+
fn init_logs() {
117+
use tracing_subscriber::layer::SubscriberExt;
118+
use tracing_subscriber::Layer;
119+
let level_filter = std::env::var("STUN_LOG")
120+
.ok()
121+
.and_then(|var| var.parse::<tracing_subscriber::filter::Targets>().ok())
122+
.unwrap_or(tracing_subscriber::filter::Targets::new().with_default(tracing::Level::ERROR));
123+
let registry = tracing_subscriber::registry().with(
124+
tracing_subscriber::fmt::layer()
125+
.with_file(true)
126+
.with_line_number(true)
127+
.with_level(true)
128+
.with_target(false)
129+
.with_writer(std::io::stderr)
130+
.with_filter(level_filter),
131+
);
132+
tracing::subscriber::set_global_default(registry).unwrap()
133+
}
134+
118135
fn main() -> std::io::Result<()> {
119-
if let Ok(filter) = EnvFilter::try_from_default_env() {
120-
tracing_subscriber::fmt().with_env_filter(filter).init();
121-
}
136+
init_logs();
122137

123138
let args: Vec<String> = env::args().collect();
124139
let proto = if args.len() > 1 {

0 commit comments

Comments
 (0)