refactor: move init_logging to utils crate

Ekhorn · Jan 16, 2024 · 48acc93 · 48acc93
1 parent e2f0224
commit 48acc93
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/srcs/services/item_producer/Cargo.toml b/srcs/services/item_producer/Cargo.toml
@@ -23,14 +23,19 @@ clap.workspace = true
 prost.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-socketioxide = { version = "0.10", features = ["tracing", "extensions", "state"] }
+socketioxide = { version = "0.10", features = [
+  "tracing",
+  "extensions",
+  "state",
+] }
 sqlx.workspace = true
 tokio.workspace = true
 tower.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 futures.workspace = true
 futures-util.workspace = true
+utils = { path = "../../utils" }
 
 [dev-dependencies]
 rust_socketio = { version = "0.4.4", features = ["async"] }
diff --git a/srcs/services/item_producer/src/main.rs b/srcs/services/item_producer/src/main.rs
@@ -15,8 +15,7 @@ use socketioxide::{
 use sqlx::PgPool;
 use tokio::net::TcpListener;
 use tower::ServiceBuilder;
-use tracing::{error, info, level_filters::LevelFilter};
-use tracing_subscriber::EnvFilter;
+use tracing::{error, info};
 
 mod clients;
 mod consumer;
@@ -50,7 +49,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-  init_logging();
+  utils::init_logging();
 
   let args = Args::parse();
   let db_pool = PgPool::connect(&args.database_host).await?;
@@ -114,18 +113,6 @@ async fn app(db_pool: PgPool, shared_amqp_channel: Arc<Channel>) -> anyhow::Resu
   Ok(Router::new().layer(ServiceBuilder::new().layer(io_layer)))
 }
 
-fn init_logging() {
-  let env_filter = EnvFilter::builder()
-    .with_default_directive(LevelFilter::INFO.into())
-    .from_env_lossy();
-
-  tracing_subscriber::fmt()
-    .with_target(true)
-    .with_level(true)
-    .with_env_filter(env_filter)
-    .init();
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;

diff --git a/srcs/services/user_service/src/main.rs b/srcs/services/user_service/src/main.rs
@@ -4,7 +4,6 @@ use sqlx::PgPool;
 use tokio::net::TcpListener;
 use tower_http::trace::TraceLayer;
 use tracing::info;
-use tracing_subscriber::{filter::LevelFilter, EnvFilter};
 
 mod auth;
 mod handlers;
@@ -23,7 +22,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-  init_logging();
+  utils::init_logging();
 
   let args = Args::parse();
 
@@ -45,15 +44,3 @@ async fn main() -> anyhow::Result<()> {
 
   Ok(())
 }
-
-fn init_logging() {
-  let env_filter = EnvFilter::builder()
-    .with_default_directive(LevelFilter::INFO.into())
-    .from_env_lossy();
-
-  tracing_subscriber::fmt()
-    .with_target(true)
-    .with_level(true)
-    .with_env_filter(env_filter)
-    .init();
-}
diff --git a/srcs/utils/Cargo.toml b/srcs/utils/Cargo.toml
@@ -14,3 +14,5 @@ crate-type = ["lib"]
 axum = { workspace = true, features = ["macros"] }
 serde.workspace = true
 serde_json.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
diff --git a/srcs/utils/src/lib.rs b/srcs/utils/src/lib.rs
@@ -7,6 +7,9 @@ use axum::{
 use serde::Serialize;
 use serde_json::json;
 
+use tracing::level_filters::LevelFilter;
+use tracing_subscriber::EnvFilter;
+
 #[derive(FromRequest)]
 #[from_request(via(axum::Json), rejection(ApiError))]
 pub struct Json<T>(pub T);
@@ -38,3 +41,15 @@ impl From<JsonRejection> for ApiError {
     Self(rejection.status(), Some(rejection.body_text()))
   }
 }
+
+pub fn init_logging() {
+  let env_filter = EnvFilter::builder()
+    .with_default_directive(LevelFilter::INFO.into())
+    .from_env_lossy();
+
+  tracing_subscriber::fmt()
+    .with_target(true)
+    .with_level(true)
+    .with_env_filter(env_filter)
+    .init();
+}