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

refactor: improve log management by introducing a constant for max logs and simplifying log level handling

Browse Source
This commit is contained in:
Tunglies
2025-08-19 22:43:15 +08:00
parent 4cf2f6b1e6
commit e93846ddc1
1 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src-tauri/src/ipc/logs.rs
View File

@@ -8,6 +8,8 @@ use crate::{
utils::{dirs::ipc_path, logging::Type}, utils::{dirs::ipc_path, logging::Type},
}; };
const MAX_LOGS: usize = 1000; // Maximum number of logs to keep in memory
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
pub struct LogData { pub struct LogData {
#[serde(rename = "type")] #[serde(rename = "type")]
@@ -48,15 +50,15 @@ impl LogItem {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct CurrentLogs { pub struct CurrentLogs {
pub logs: VecDeque<LogItem>, pub logs: VecDeque<LogItem>,
pub level: String, // pub level: String,
pub last_updated: Instant, pub last_updated: Instant,
} }
impl Default for CurrentLogs { impl Default for CurrentLogs {
fn default() -> Self { fn default() -> Self {
Self { Self {
logs: VecDeque::with_capacity(1000), logs: VecDeque::with_capacity(MAX_LOGS),
level: "info".to_string(), // level: "info".to_string(),
last_updated: Instant::now(), last_updated: Instant::now(),
} }
} }
@@ -97,24 +99,24 @@ impl LogsMonitor {
let filter_level = level.clone().unwrap_or_else(|| "info".to_string()); let filter_level = level.clone().unwrap_or_else(|| "info".to_string());
// Check if we're already monitoring the same level // Check if we're already monitoring the same level
let level_changed = { // let level_changed = {
let current_level = self.current_monitoring_level.read().await; // let current_level = self.current_monitoring_level.read().await;
if let Some(existing_level) = current_level.as_ref() { // if let Some(existing_level) = current_level.as_ref() {
if existing_level == &filter_level { // if existing_level == &filter_level {
logging!( // logging!(
info, // info,
Type::Ipc, // Type::Ipc,
true, // true,
"LogsMonitor: Already monitoring level '{}', skipping duplicate request", // "LogsMonitor: Already monitoring level '{}', skipping duplicate request",
filter_level // filter_level
); // );
return; // return;
} // }
true // Level changed // true // Level changed
} else { // } else {
true // First time or was stopped // true // First time or was stopped
} // }
}; // };
// Stop existing monitoring task if level changed or first time // Stop existing monitoring task if level changed or first time
{ {
@@ -130,20 +132,24 @@ impl LogsMonitor {
} }
} }
// We want to keep the logs cache even if the level changes,
// so we don't clear it here. The cache will be cleared only when the level changes
// and a new task is started. This allows us to keep logs from previous levels
// even if the level changes during monitoring.
// Clear logs cache when level changes to ensure fresh data // Clear logs cache when level changes to ensure fresh data
if level_changed { // if level_changed {
let mut current = self.current.write().await; // let mut current = self.current.write().await;
current.logs.clear(); // current.logs.clear();
current.level = filter_level.clone(); // current.level = filter_level.clone();
current.mark_fresh(); // current.mark_fresh();
logging!( // logging!(
info, // info,
Type::Ipc, // Type::Ipc,
true, // true,
"LogsMonitor: Cleared logs cache due to level change to '{}'", // "LogsMonitor: Cleared logs cache due to level change to '{}'",
filter_level // filter_level
); // );
} // }
// Update current monitoring level // Update current monitoring level
{ {