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

add console log event format hook

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-12-30 12:28:18 +00:00 • committed by strawberry
parent 9c6b5b4407
commit 203cf57fdf
4 changed files with 104 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/logging.rs
View file

@ -3,11 +3,11 @@ use std::sync::Arc;
use conduwuit::{
config::Config,
debug_warn, err,
log::{capture, fmt_span, LogLevelReloadHandles},
log::{capture, fmt_span, ConsoleFormat, LogLevelReloadHandles},
result::UnwrapOrErr,
Result,
};
use tracing_subscriber::{layer::SubscriberExt, reload, EnvFilter, Layer, Registry};
use tracing_subscriber::{fmt, layer::SubscriberExt, reload, EnvFilter, Layer, Registry};
#[cfg(feature = "perf_measurements")]
pub(crate) type TracingFlameGuard =
@ -26,10 +26,12 @@ pub(crate) fn init(
.with_regex(config.log_filter_regex)
.parse(&config.log)
.map_err(|e| err!(Config("log", "{e}.")))?;
let console_layer = tracing_subscriber::fmt::Layer::new()
.with_ansi(config.log_colors)
let console_layer = fmt::Layer::new()
.with_span_events(console_span_events)
.with_thread_ids(config.log_thread_ids);
.event_format(ConsoleFormat::new(config))
.fmt_fields(ConsoleFormat::new(config))
.map_writer(|w| w);
let (console_reload_filter, console_reload_handle) =
reload::Layer::new(console_filter.clone());
reload_handles.add("console", Box::new(console_reload_handle));