From 2a8c1bb6321e5635ad346694f2c325b89b118798 Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Tue, 8 Aug 2023 18:24:50 -0700 Subject: [PATCH] let libtest capture logs --- server/base/tracing_setup.rs | 16 ++++++++++++++++ server/db/testutil.rs | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/server/base/tracing_setup.rs b/server/base/tracing_setup.rs index 68e4980..4e82b2d 100644 --- a/server/base/tracing_setup.rs +++ b/server/base/tracing_setup.rs @@ -154,3 +154,19 @@ pub fn install() { std::panic::set_hook(Box::new(&panic_hook)); } } + +pub fn install_for_tests() { + let filter = tracing_subscriber::EnvFilter::builder() + .with_default_directive(tracing_subscriber::filter::LevelFilter::INFO.into()) + .with_env_var("MOONFIRE_LOG") + .from_env_lossy(); + tracing_log::LogTracer::init().unwrap(); + let sub = tracing_subscriber::registry().with( + tracing_subscriber::fmt::Layer::new() + .with_test_writer() + .with_timer(ChronoTimer) + .with_thread_names(true) + .with_filter(filter), + ); + tracing::subscriber::set_global_default(sub).unwrap(); +} diff --git a/server/db/testutil.rs b/server/db/testutil.rs index eb193df..7e619cb 100644 --- a/server/db/testutil.rs +++ b/server/db/testutil.rs @@ -38,7 +38,7 @@ pub const TEST_VIDEO_SAMPLE_ENTRY_DATA: &[u8] = /// * use a fast but insecure password hashing format. pub fn init() { INIT.call_once(|| { - base::tracing_setup::install(); + base::tracing_setup::install_for_tests(); env::set_var("TZ", "America/Los_Angeles"); time::tzset(); crate::auth::set_test_config();