Skip to content
Snippets Groups Projects
Commit 7d2f510c authored by Jason Volk's avatar Jason Volk
Browse files

single-source for defaulty log filter string


Signed-off-by: default avatarJason Volk <jason@zemos.net>
parent 102bd1b4
No related branches found
No related tags found
1 merge request!414Misc code splits/reorgs; accept unknown receipt; sendjoin warn quash
......@@ -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()
......
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")
},
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment