gitea-admin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-11-08 19:22:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: reconfig log dynamically (#5724)

Browse Source
This commit is contained in:
oomeow
2026-01-04 16:56:16 +08:00
committed by GitHub
parent 4adf678480
commit 421bbd090e
11 changed files with 279 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/core/manager/state.rs
+5 -10
View File
@@ -2,14 +2,13 @@ use super::{CoreManager, RunningMode};
use crate::{
AsyncHandler,
config::{Config, IClashTemp},
core::{handle, manager::CLASH_LOGGER, service},
core::{handle, logger::Logger, manager::CLASH_LOGGER, service},
logging,
utils::{dirs, init::sidecar_writer},
utils::dirs,
};
use anyhow::Result;
use clash_verge_logging::{SharedWriter, Type, write_sidecar_log};
use clash_verge_logging::Type;
use compact_str::CompactString;
use flexi_logger::DeferredNow;
use log::Level;
use scopeguard::defer;
use tauri_plugin_shell::ShellExt as _;
@@ -60,20 +59,16 @@ impl CoreManager {
self.set_running_child_sidecar(child);
self.set_running_mode(RunningMode::Sidecar);
let shared_writer: SharedWriter = std::sync::Arc::new(tokio::sync::Mutex::new(sidecar_writer().await?));
AsyncHandler::spawn(|| async move {
while let Some(event) = rx.recv().await {
match event {
tauri_plugin_shell::process::CommandEvent::Stdout(line)
| tauri_plugin_shell::process::CommandEvent::Stderr(line) => {
let mut now = DeferredNow::default();
let message = CompactString::from(String::from_utf8_lossy(&line).as_ref());
write_sidecar_log(shared_writer.lock().await, &mut now, Level::Error, &message);
Logger::global().writer_sidecar_log(Level::Error, &message);
CLASH_LOGGER.append_log(message).await;
}
tauri_plugin_shell::process::CommandEvent::Terminated(term) => {
let mut now = DeferredNow::default();
let message = if let Some(code) = term.code {
CompactString::from(format!("Process terminated with code: {}", code))
} else if let Some(signal) = term.signal {
@@ -81,7 +76,7 @@ impl CoreManager {
} else {
CompactString::from("Process terminated")
};
write_sidecar_log(shared_writer.lock().await, &mut now, Level::Info, &message);
Logger::global().writer_sidecar_log(Level::Info, &message);
CLASH_LOGGER.clear_logs().await;
break;
}