From 91812e7b000768acaa6231ce7437bc1c7167517d Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Tue, 7 Jan 2025 15:07:56 +0100
Subject: [PATCH] cleanups & self-review

---
 libs/remote_storage/tests/common/mod.rs | 6 +++---
 libs/utils/src/lib.rs                   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libs/remote_storage/tests/common/mod.rs b/libs/remote_storage/tests/common/mod.rs
index e58ad94283..0ef5cd7fcc 100644
--- a/libs/remote_storage/tests/common/mod.rs
+++ b/libs/remote_storage/tests/common/mod.rs
@@ -13,7 +13,7 @@ use tokio::task::JoinSet;
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, info};
 
-static LOGGING_DONE: OnceCell<()> = OnceCell::new();
+static LOGGING_DONE: OnceCell<utils::logging::FlushGuard> = OnceCell::new();
 
 pub(crate) fn upload_stream(
     content: std::borrow::Cow<'static, [u8]>,
@@ -205,11 +205,11 @@ pub(crate) async fn upload_remote_data(
 
 pub(crate) fn ensure_logging_ready() {
     LOGGING_DONE.get_or_init(|| {
-        let _ = utils::logging::init(
+        utils::logging::init(
             utils::logging::LogFormat::Test,
             utils::logging::TracingErrorLayerEnablement::Disabled,
             utils::logging::Output::Stdout,
         )
-        .expect("logging init failed");
+        .expect("logging init failed")
     });
 }
diff --git a/libs/utils/src/lib.rs b/libs/utils/src/lib.rs
index 94daf11ca0..2c56dd750f 100644
--- a/libs/utils/src/lib.rs
+++ b/libs/utils/src/lib.rs
@@ -31,7 +31,6 @@ pub mod id;
 pub mod shard;
 
 mod hex;
-
 pub use hex::Hex;
 
 // http endpoint utils