feat: reconfig log dynamically (#5724)

src-tauri/src/utils/init.rs

@@ -6,137 +6,18 @@ use crate::{
     logging,
     process::AsyncHandler,
     utils::{
-        dirs::{self, PathBufExec as _, service_log_dir, sidecar_log_dir},
+        dirs::{self, PathBufExec as _},
         help,
     },
 };
 use anyhow::Result;
 use chrono::{Local, TimeZone as _};
-#[cfg(all(not(feature = "tauri-dev"), not(feature = "tracing-full")))]
-use clash_verge_logging::NoModuleFilter;
 use clash_verge_logging::Type;
-use clash_verge_service_ipc::WriterConfig;
-use flexi_logger::writers::FileLogWriter;
-use flexi_logger::{Cleanup, Criterion, FileSpec};
-#[cfg(not(feature = "tauri-dev"))]
-use flexi_logger::{Duplicate, LogSpecBuilder, Logger, LoggerHandle};
 use std::{path::PathBuf, str::FromStr as _};
 use tauri_plugin_shell::ShellExt as _;
 use tokio::fs;
 use tokio::fs::DirEntry;
 
-/// initialize this instance's log file
-#[cfg(not(feature = "tauri-dev"))]
-pub async fn init_logger() -> Result<LoggerHandle> {
-    // TODO 提供 runtime 级别实时修改
-    let (log_level, log_max_size, log_max_count) = {
-        let verge_guard = Config::verge().await;
-        let verge = verge_guard.data_arc();
-        (
-            verge.get_log_level(),
-            verge.app_log_max_size.unwrap_or(128),
-            verge.app_log_max_count.unwrap_or(8),
-        )
-    };
-
-    let log_dir = dirs::app_logs_dir()?;
-    let mut spec = LogSpecBuilder::new();
-    let level = std::env::var("RUST_LOG")
-        .ok()
-        .and_then(|v| log::LevelFilter::from_str(&v).ok())
-        .unwrap_or(log_level);
-    spec.default(level);
-    #[cfg(feature = "tracing")]
-    spec.module("tauri", log::LevelFilter::Debug)
-        .module("wry", log::LevelFilter::Off)
-        .module("tauri_plugin_mihomo", log::LevelFilter::Off);
-    let spec = spec.build();
-
-    let logger = Logger::with(spec)
-        .log_to_file(FileSpec::default().directory(log_dir).basename(""))
-        .duplicate_to_stdout(Duplicate::Debug)
-        .format(clash_verge_logger::console_format)
-        .format_for_files(clash_verge_logger::file_format_with_level)
-        .rotate(
-            Criterion::Size(log_max_size * 1024),
-            flexi_logger::Naming::TimestampsCustomFormat {
-                current_infix: Some("latest"),
-                format: "%Y-%m-%d_%H-%M-%S",
-            },
-            Cleanup::KeepLogFiles(log_max_count),
-        );
-    #[cfg(all(not(feature = "tracing"), not(feature = "tracing-full")))]
-    let logger = logger.filter(Box::new(NoModuleFilter(&[
-        "wry",
-        "tauri",
-        "tokio_tungstenite",
-        "tungstenite",
-    ])));
-    #[cfg(feature = "tracing")]
-    let logger = logger.filter(Box::new(NoModuleFilter(&[
-        "wry",
-        "tauri_plugin_mihomo",
-        "tokio_tungstenite",
-        "tungstenite",
-        "kode_bridge",
-    ])));
-
-    let handle = logger.start()?;
-
-    // TODO 全局 logger handle 控制
-    // GlobalLoggerProxy::global().set_inner(handle);
-    // TODO 提供前端设置等级，热更新等级
-    // logger.parse_new_spec(spec)
-
-    Ok(handle)
-}
-
-pub async fn sidecar_writer() -> Result<FileLogWriter> {
-    let (log_max_size, log_max_count) = {
-        let verge_guard = Config::verge().await;
-        let verge = verge_guard.data_arc();
-        (
-            verge.app_log_max_size.unwrap_or(128),
-            verge.app_log_max_count.unwrap_or(8),
-        )
-    };
-    let sidecar_log_dir = sidecar_log_dir()?;
-    Ok(FileLogWriter::builder(
-        FileSpec::default()
-            .directory(sidecar_log_dir)
-            .basename("sidecar")
-            .suppress_timestamp(),
-    )
-    .format(clash_verge_logger::file_format_without_level)
-    .rotate(
-        Criterion::Size(log_max_size * 1024),
-        flexi_logger::Naming::TimestampsCustomFormat {
-            current_infix: Some("latest"),
-            format: "%Y-%m-%d_%H-%M-%S",
-        },
-        Cleanup::KeepLogFiles(log_max_count),
-    )
-    .try_build()?)
-}
-
-pub async fn service_writer_config() -> Result<WriterConfig> {
-    let (log_max_size, log_max_count) = {
-        let verge_guard = Config::verge().await;
-        let verge = verge_guard.data_arc();
-        (
-            verge.app_log_max_size.unwrap_or(128),
-            verge.app_log_max_count.unwrap_or(8),
-        )
-    };
-    let service_log_dir = dirs::path_to_str(&service_log_dir()?)?.into();
-
-    Ok(WriterConfig {
-        directory: service_log_dir,
-        max_log_size: log_max_size * 1024,
-        max_log_files: log_max_count,
-    })
-}
-
 // TODO flexi_logger 提供了最大保留天数，或许我们应该用内置删除log文件
 /// 删除log文件
 pub async fn delete_log() -> Result<()> {

src-tauri/src/utils/resolve/mod.rs

@@ -1,13 +1,13 @@
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use anyhow::Result;
-use flexi_logger::LoggerHandle;
 
 use crate::{
     config::Config,
     core::{
         CoreManager, Timer, handle,
         hotkey::Hotkey,
+        logger::Logger,
         service::{SERVICE_MANAGER, ServiceManager, is_service_ipc_path_exists},
         sysopt,
         tray::Tray,
@@ -28,20 +28,13 @@ pub mod window_script;
 
 static RESOLVE_DONE: AtomicBool = AtomicBool::new(false);
 
-pub fn init_work_dir_and_logger() -> Option<LoggerHandle> {
+pub fn init_work_dir_and_logger() -> anyhow::Result<()> {
     AsyncHandler::block_on(async {
         init_work_config().await;
         init_resources().await;
-
-        #[cfg(not(feature = "tauri-dev"))]
-        {
-            logging!(info, Type::Setup, "Initializing logger");
-            init::init_logger().await.ok()
-        }
-        #[cfg(feature = "tauri-dev")]
-        {
-            None
-        }
+        logging!(info, Type::Setup, "Initializing logger");
+        Logger::global().init().await?;
+        Ok(())
     })
 }