magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop using set_env to configure tracing-subscriber

Browse source
This commit is contained in:
Jonas Platte 2022-01-22 13:27:54 +01:00
parent abb4b4cf0b
commit ce60fc6859
No known key found for this signature in database
GPG key ID: CC154DE0E30B7C67
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main.rs
View file

@ -184,9 +184,6 @@ fn setup_rocket(config: Figment, data: Arc<RwLock<Database>>) -> rocket::Rocket<
#[rocket::main] #[rocket::main]
async fn main() { async fn main() {
// Force log level off, so we can use our own logger
std::env::set_var("CONDUIT_LOG_LEVEL", "off");
let raw_config = let raw_config =
Figment::from(default_config()) Figment::from(default_config())
.merge( .merge(
@ -197,8 +194,6 @@ async fn main() {
) )
.merge(Env::prefixed("CONDUIT_").global()); .merge(Env::prefixed("CONDUIT_").global());
std::env::set_var("RUST_LOG", "warn");
let config = match raw_config.extract::<Config>() { let config = match raw_config.extract::<Config>() {
Ok(s) => s, Ok(s) => s,
Err(e) => { Err(e) => {
@ -244,8 +239,6 @@ async fn main() {
println!("exporting"); println!("exporting");
opentelemetry::global::shutdown_tracer_provider(); opentelemetry::global::shutdown_tracer_provider();
} else { } else {
std::env::set_var("RUST_LOG", &config.log);
let registry = tracing_subscriber::Registry::default(); let registry = tracing_subscriber::Registry::default();
if config.tracing_flame { if config.tracing_flame {
let (flame_layer, _guard) = let (flame_layer, _guard) =
@ -259,7 +252,7 @@ async fn main() {
start.await; start.await;
} else { } else {
let fmt_layer = tracing_subscriber::fmt::Layer::new(); let fmt_layer = tracing_subscriber::fmt::Layer::new();
let filter_layer = EnvFilter::try_from_default_env() let filter_layer = EnvFilter::try_new(&config.log)
.or_else(|_| EnvFilter::try_new("info")) .or_else(|_| EnvFilter::try_new("info"))
.unwrap(); .unwrap();