root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update logging macros usage in timer module

Browse Source 
Replace log macros with custom logging macros in timer module
This commit is contained in:
Tunglies
2025-04-05 11:34:51 +08:00
parent 0de304d4e3
commit 0b8d08d13b
6 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src-tauri/src/utils/logging.rs
View File

@@ -86,12 +86,17 @@ macro_rules! wrap_err {
#[macro_export]
macro_rules! logging {
// 带 println 的版本（支持格式化参数）
($level:ident, $type:expr, $print:expr, $($arg:tt)*) => {
($level:ident, $type:expr, true, $($arg:tt)*) => {
println!("{} {}", $type, format_args!($($arg)*));
log::$level!(target: "app", "{} {}", $type, format_args!($($arg)*));
};
// 不带 println 的版本
// 带 println 的版本（使用 false 明确不打印）
($level:ident, $type:expr, false, $($arg:tt)*) => {
log::$level!(target: "app", "{} {}", $type, format_args!($($arg)*));
};
// 不带 print 参数的版本（默认不打印）
($level:ident, $type:expr, $($arg:tt)*) => {
log::$level!(target: "app", "{} {}", $type, format_args!($($arg)*));
};
@@ -99,7 +104,7 @@ macro_rules! logging {
#[macro_export]
macro_rules! logging_error {
// Version with println and Result expression
// 1. 处理 Result<T, E>，带打印控制
($type:expr, $print:expr, $expr:expr) => {
match $expr {
Ok(_) => {},
@@ -107,28 +112,28 @@ macro_rules! logging_error {
if $print {
println!("[{}] Error: {}", $type, err);
}
log::error!(target: "app", "{} {}", $type, err);
log::error!(target: "app", "[{}] {}", $type, err);
}
}
};
// Version without println and Result expression
// 2. 处理 Result<T, E>，默认不打印
($type:expr, $expr:expr) => {
if let Err(err) = $expr {
log::error!(target: "app", "{} {}", $type, err);
log::error!(target: "app", "[{}] {}", $type, err);
}
};
// Version with println and custom message
($type:expr, $print:expr, $($arg:tt)*) => {
// 3. 处理格式化字符串，带打印控制
($type:expr, $print:expr, $fmt:literal $(, $arg:expr)*) => {
if $print {
println!("[{}] {}", $type, format_args!($($arg)*));
println!("[{}] {}", $type, format_args!($fmt $(, $arg)*));
}
log::error!(target: "app", "{} {}", $type, format_args!($($arg)*));
log::error!(target: "app", "[{}] {}", $type, format_args!($fmt $(, $arg)*));
};
// Version without println and custom message
($type:expr, $($arg:tt)*) => {
log::error!(target: "app", "{} {}", $type, format_args!($($arg)*));
// 4. 处理格式化字符串，不带 bool 时，默认 `false`
($type:expr, $fmt:literal $(, $arg:expr)*) => {
logging_error!($type, false, $fmt $(, $arg)*);
};
}