diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs index 1440aa8a156df67270bf131cd89715347905857f..edd6616651e82a5627543899baeb13729d697083 100644 --- a/src-tauri/src/config/verge.rs +++ b/src-tauri/src/config/verge.rs @@ -10,7 +10,7 @@ pub struct IVerge { pub app_singleton_port: Option<u16>, /// app log level - /// `trace` `debug` `info` `warn` `error` + /// silent | error | warn | info | debug | trace pub app_log_level: Option<String>, // i18n @@ -193,11 +193,12 @@ impl IVerge { pub fn get_log_level(&self) -> LevelFilter { if let Some(level) = self.app_log_level.as_ref() { match level.to_lowercase().as_str() { - "trace" => LevelFilter::Trace, - "debug" => LevelFilter::Debug, - "info" => LevelFilter::Info, - "warn" => LevelFilter::Warn, + "silent" => LevelFilter::Off, "error" => LevelFilter::Error, + "warn" => LevelFilter::Warn, + "info" => LevelFilter::Info, + "debug" => LevelFilter::Debug, + "trace" => LevelFilter::Trace, _ => LevelFilter::Info, } } else { diff --git a/src-tauri/src/utils/init.rs b/src-tauri/src/utils/init.rs index 4135441fba1b7ef01a44b6b45725d60930d8e613..2fae79d917b999d329b2c1c61d4e244ebdbfa41c 100644 --- a/src-tauri/src/utils/init.rs +++ b/src-tauri/src/utils/init.rs @@ -18,6 +18,9 @@ fn init_log() -> Result<()> { } let log_level = Config::verge().data().get_log_level(); + if log_level == LevelFilter::Off { + return Ok(()); + } let local_time = Local::now().format("%Y-%m-%d-%H%M").to_string(); let log_file = format!("{}.log", local_time); diff --git a/src/components/setting/mods/misc-viewer.tsx b/src/components/setting/mods/misc-viewer.tsx index 2bd884c7ed218303a7c4ea072367bee2eb00123e..009d8988350aafd724aab6e36d7b2f5345a21cf4 100644 --- a/src/components/setting/mods/misc-viewer.tsx +++ b/src/components/setting/mods/misc-viewer.tsx @@ -83,9 +83,9 @@ export const MiscViewer = forwardRef<DialogRef>((props, ref) => { })); }} > - {["trace", "debug", "info", "warn", "error"].map((i) => ( + {["trace", "debug", "info", "warn", "error", "silent"].map((i) => ( <MenuItem value={i} key={i}> - {i} + {i[0].toUpperCase() + i.slice(1).toLowerCase()} </MenuItem> ))} </Select>