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

refactor: logger fetch logic

Browse Source
This commit is contained in:
huzibaca
2024-11-18 05:58:06 +08:00
parent 824325a2eb
commit 9ebd96611a
9 changed files with 50 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src-tauri/src/core/core.rs
View File

@@ -1,5 +1,5 @@
use crate::config::*;
use crate::core::{clash_api, handle, logger::Logger, service};
use crate::core::{clash_api, handle, service};
use crate::log_err;
use crate::utils::dirs;
use anyhow::{bail, Result};
@@ -43,24 +43,13 @@ impl CoreManager {
let test_dir = dirs::path_to_str(&test_dir)?;
let app_handle = handle::Handle::global().app_handle().unwrap();
let output = app_handle
let _ = app_handle
.shell()
.sidecar(clash_core)?
.args(["-t", "-d", test_dir, "-f", config_path])
.output()
.await?;
if !output.status.success() {
let stdout = String::from_utf8(output.stdout).unwrap_or_default();
let error = clash_api::parse_check_output(stdout.clone());
let error = match !error.is_empty() {
true => error,
false => stdout.clone(),
};
Logger::global().set_log(stdout.clone());
bail!("{error}");
}
Ok(())
}
@@ -136,9 +125,6 @@ impl CoreManager {
self.check_config().await?;
// 清掉旧日志
Logger::global().clear_log();
match self.restart_core().await {
Ok(_) => {
Config::verge().apply();