From a752fb99430b32e4cf7c3e2bd0a4cff9e8773980 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 8 Dec 2024 13:47:02 +0000 Subject: [PATCH] rename mod with tracing inits due to macro issues Signed-off-by: Jason Volk --- src/main/{tracing.rs => logging.rs} | 0 src/main/main.rs | 2 +- src/main/server.rs | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/{tracing.rs => logging.rs} (100%) diff --git a/src/main/tracing.rs b/src/main/logging.rs similarity index 100% rename from src/main/tracing.rs rename to src/main/logging.rs diff --git a/src/main/main.rs b/src/main/main.rs index 67fb643f..c653444c 100644 --- a/src/main/main.rs +++ b/src/main/main.rs @@ -1,10 +1,10 @@ pub(crate) mod clap; +mod logging; mod mods; mod restart; mod sentry; mod server; mod signal; -mod tracing; extern crate conduit_core as conduit; diff --git a/src/main/server.rs b/src/main/server.rs index 27fd0673..179749b5 100644 --- a/src/main/server.rs +++ b/src/main/server.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use conduit::{config::Config, info, log::Log, utils::sys, Error, Result}; use tokio::{runtime, sync::Mutex}; -use crate::{clap::Args, tracing::TracingFlameGuard}; +use crate::{clap::Args, logging::TracingFlameGuard}; /// Server runtime state; complete pub(crate) struct Server { @@ -33,7 +33,7 @@ impl Server { #[cfg(feature = "sentry_telemetry")] let sentry_guard = crate::sentry::init(&config); - let (tracing_reload_handle, tracing_flame_guard, capture) = crate::tracing::init(&config)?; + let (tracing_reload_handle, tracing_flame_guard, capture) = crate::logging::init(&config)?; config.check()?;