From 7d2f510cc3d390c8596d0f1614bbe0ba4dc5a875 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 31 May 2024 05:39:51 +0000
Subject: [PATCH] single-source for defaulty log filter string
Signed-off-by: Jason Volk <jason@zemos.net>
---
src/core/config/mod.rs | 3 ++-
src/main/server.rs | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs
index 665cbe203..bb13923be 100644
--- a/src/core/config/mod.rs
+++ b/src/core/config/mod.rs
@@ -975,7 +975,8 @@ fn default_tracing_flame_output_path() -> String { "./tracing.folded".to_owned()
fn default_trusted_servers() -> Vec<OwnedServerName> { vec![OwnedServerName::try_from("matrix.org").unwrap()] }
-fn default_log() -> String {
+#[must_use]
+pub fn default_log() -> String {
// do debug logging by default for debug builds
if cfg!(debug_assertions) {
"debug".to_owned()
diff --git a/src/main/server.rs b/src/main/server.rs
index d960bfac3..8e61d502e 100644
--- a/src/main/server.rs
+++ b/src/main/server.rs
@@ -1,6 +1,7 @@
use std::sync::Arc;
use conduit::{
+ config,
config::Config,
info,
log::{LogLevelReloadHandles, ReloadHandle},
@@ -103,7 +104,7 @@ fn init_tracing(config: &Config) -> (LogLevelReloadHandles, TracingFlameGuard) {
Ok(s) => s,
Err(e) => {
eprintln!("It looks like your config is invalid. The following error occured while parsing it: {e}");
- EnvFilter::try_new("warn").unwrap()
+ EnvFilter::try_new(config::default_log()).expect("failed to set default EnvFilter")
},
};
--
GitLab