logging for tests too

xps-gateway/Cargo.toml

@@ -17,3 +17,4 @@ async-trait = "0.1"
 jsonrpsee = { version = "0.21", features = ["macros", "server", "client-core"] }
 anyhow = "1"
 thiserror = "1"
+ctor = "0.2"

xps-gateway/src/lib.rs

@@ -1,15 +1,15 @@
 mod rpc;
 mod types;
+mod util;
 
 use anyhow::Result;
 use jsonrpsee::server::Server;
-use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
 
 pub use crate::rpc::{XpsMethods, XpsServer};
 
 /// Entrypoint for the xps Gateway
 pub async fn run() -> Result<()> {
-    init_logging();
+    crate::util::init_logging();
 
     // a port of 0 allows the OS to choose an open port
     let server = Server::builder().build("127.0.0.1:0").await?;
@@ -20,12 +20,3 @@ pub async fn run() -> Result<()> {
     handle.stopped().await;
     Ok(())
 }
-
-/// Start [`tracing`] logging
-pub(crate) fn init_logging() {
-    let fmt = fmt::layer().compact();
-    Registry::default()
-        .with(EnvFilter::from_default_env())
-        .with(fmt)
-        .init()
-}

xps-gateway/src/util.rs

@@ -0,0 +1,28 @@
+//! Internal Utility functions for use in crate
+
+#[cfg(test)]
+use std::sync::Once;
+use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
+
+#[cfg(test)]
+static INIT: Once = Once::new();
+
+pub(crate) fn init_logging() {
+    let fmt = fmt::layer().compact();
+    Registry::default()
+        .with(EnvFilter::from_default_env())
+        .with(fmt)
+        .init()
+}
+
+#[cfg(test)]
+#[ctor::ctor]
+fn __init_test_logging() {
+    INIT.call_once(|| {
+        let fmt = fmt::layer().compact();
+        Registry::default()
+            .with(EnvFilter::from_default_env())
+            .with(fmt)
+            .init()
+    })
+}