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

single-source for defaulty log filter string

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-05-31 05:39:51 +00:00
parent 102bd1b4a6
commit 7d2f510cc3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/config/mod.rs
View file

@ -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_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 // do debug logging by default for debug builds
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
"debug".to_owned() "debug".to_owned()

3
src/main/server.rs
View file

@ -1,6 +1,7 @@
use std::sync::Arc; use std::sync::Arc;
use conduit::{ use conduit::{
config,
config::Config, config::Config,
info, info,
log::{LogLevelReloadHandles, ReloadHandle}, log::{LogLevelReloadHandles, ReloadHandle},
@ -103,7 +104,7 @@ fn init_tracing(config: &Config) -> (LogLevelReloadHandles, TracingFlameGuard) {
Ok(s) => s, Ok(s) => s,
Err(e) => { Err(e) => {
eprintln!("It looks like your config is invalid. The following error occured while parsing it: {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")
}, },
}; };