Merge branch 'dev-logger' into dev

Cargo.toml

@@ -36,7 +36,7 @@ bytes = { version = "1.4", features = ["serde"] }
 clap = { version = "4.3", features = ["derive", "env"] }
 futures = { version = "0.3" }
 futures-util = { version = "0.3" }
-log = {version="0.4"}
+log = { version = "0.4" }
 reqwest = { version = "0.11", features = ["json"] }
 scraper = "0.18"
 sea-orm = { version = "0.12", features = [
@@ -52,6 +52,7 @@ tokio-util = { version = "0.7", features = ["codec"] }
 tokio-stream = "0.1.14"
 tokio-tungstenite = { version = "0.19" }
 tracing = { version = "0.1" }
-tracing-subscriber = { version = "0.3" }
+tracing-appender = { version = "0.2" }
+tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] }
 tracing-log = { version = "0.2" }
 walkdir = { version = "2" }

garage-cli/Cargo.toml

@@ -30,4 +30,5 @@ serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-log = { workspace = true }
-tracing-subscriber = { workspace = true }
+tracing-appender = { workspace = true }
+tracing-subscriber = { workspace = true, features = ["json", "env-filter"] }

garage-cli/src/main.rs

@@ -2,22 +2,15 @@ mod ffmpeg;
 mod jav;
 mod spider;
 mod tenhou;
+mod utils;
+use crate::utils::Logger;
+
 use clap::Command;
-use log;
 use tracing::info;
-use tracing_log::LogTracer;
-use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt};
 
 #[tokio::main]
 async fn main() {
-    match LogTracer::init() {
-        Ok(_) => {}
-        Err(err) => {
-            println!("log init error: {}", err);
-        }
-    }
-    log::warn!("test");
-    // tracing_subscriber::registry().with(fmt::layer()).init();
+    Logger::new().init();
 
     let cmd = Command::new("garage")
         .bin_name("garage")
@@ -35,10 +28,10 @@ async fn main() {
             jav::parse_jav_cmd(sub_cmd.0, sub_cmd.1).await;
         }
         Some(("spider", _sub_m)) => {
-            println!("not work")
+            info!("todo");
         }
         Some(("tenhou", _sub_m)) => {
-            println!("not work")
+            info!("todo");
         }
         Some(("ffmpeg-batch", sub_m)) => {
             info!("ffmpeg-batch starting...");

garage-cli/src/utils/logger.rs

@@ -0,0 +1,67 @@
+use tracing_appender::rolling;
+use tracing_subscriber::{self, filter, fmt, layer::SubscriberExt, Layer};
+
+pub struct Logger {
+    log_path: Option<String>,
+    show_file: bool,
+    show_thread_names: bool,
+    log_level: filter::LevelFilter,
+}
+
+impl Logger {
+    pub fn new() -> Self {
+        Logger {
+            log_path: None,
+            show_file: false,
+            show_thread_names: false,
+            log_level: filter::LevelFilter::TRACE,
+        }
+    }
+
+    pub fn set_log_path(mut self, log_path: String) -> Self {
+        self.log_path = Some(log_path);
+        self
+    }
+
+    pub fn set_show_file(mut self, show: bool) -> Self {
+        self.show_file = show;
+        self
+    }
+
+    pub fn set_show_thread_name(mut self, show: bool) -> Self {
+        self.show_thread_names = show;
+        self
+    }
+
+    pub fn set_log_level(mut self, lvl: filter::LevelFilter) -> Self {
+        self.log_level = lvl;
+        self
+    }
+
+    pub fn init(self) {
+        match self.log_path {
+            Some(path) => {
+                let debug_file = rolling::minutely(path, "debug");
+                let a = fmt::Layer::new()
+                    .json()
+                    .with_file(self.show_file)
+                    .with_thread_names(self.show_thread_names)
+                    .with_writer(debug_file)
+                    .with_filter(self.log_level);
+                let subscriber = tracing_subscriber::Registry::default().with(a);
+                tracing::subscriber::set_global_default(subscriber)
+                    .expect("unable to set global subscriber");
+            }
+            None => {
+                let a = fmt::Layer::new()
+                    .with_file(self.show_file)
+                    .with_thread_names(self.show_thread_names)
+                    .with_writer(std::io::stdout)
+                    .with_filter(self.log_level);
+                let subscriber = tracing_subscriber::Registry::default().with(a);
+                tracing::subscriber::set_global_default(subscriber)
+                    .expect("unable to set global subscriber");
+            }
+        }
+    }
+}

garage-cli/src/utils/mod.rs

@@ -0,0 +1,2 @@
+mod logger;
+pub use logger::Logger;