去除不必要的调试日志
This commit is contained in:
@@ -1548,8 +1548,6 @@ fn notify_app_upgrade(app_name: &str, current_ver: &str, latest_ver: &str, _debu
|
|||||||
};
|
};
|
||||||
|
|
||||||
if pids.is_empty() {
|
if pids.is_empty() {
|
||||||
let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f");
|
|
||||||
log_print!("{} [升级确认] {} 未运行,跳过通知", ts, app_name);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1562,26 +1560,18 @@ fn notify_app_upgrade(app_name: &str, current_ver: &str, latest_ver: &str, _debu
|
|||||||
// 3. 对每个 PID 发送升级确认并等待用户响应(双向握手)
|
// 3. 对每个 PID 发送升级确认并等待用户响应(双向握手)
|
||||||
for pid in pids {
|
for pid in pids {
|
||||||
let pipe_name = format!("\\\\.\\pipe\\EasyTest_{}", pid);
|
let pipe_name = format!("\\\\.\\pipe\\EasyTest_{}", pid);
|
||||||
let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f");
|
|
||||||
log_print!("{} [升级确认] 连接到 {} (PID={}),等待响应...", ts, pipe_name, pid);
|
|
||||||
|
|
||||||
// 发送 UpgradeConfirm 并等待 UpgradeResponse(超时 10 秒)
|
// 发送 UpgradeConfirm 并等待 UpgradeResponse(超时 10 秒)
|
||||||
let response = connect_and_wait_response(&pipe_name, &msg, 10000);
|
let response = connect_and_wait_response(&pipe_name, &msg, 10000);
|
||||||
|
|
||||||
match response {
|
match response {
|
||||||
Ok(true) => {
|
Ok(true) => {
|
||||||
log_print!("{} [升级确认] 用户批准升级 {} (PID={}),应用将退出",
|
|
||||||
ts, app_name, pid);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Ok(false) => {
|
Ok(false) => {
|
||||||
log_print!("{} [升级确认] 用户拒绝升级 {} (PID={})",
|
|
||||||
ts, app_name, pid);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(_e) => {
|
||||||
log_print!("{} [升级确认] 通信失败 {} (PID={}): {}",
|
|
||||||
ts, app_name, pid, e);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1592,8 +1582,6 @@ fn notify_app_upgrade(app_name: &str, current_ver: &str, latest_ver: &str, _debu
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f");
|
|
||||||
log_print!("{} [升级确认] 非 Windows 平台,跳过通知", ts);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1717,12 +1705,6 @@ fn connect_and_wait_response(
|
|||||||
.trim_end_matches(|c| c == '\r' || c == '\n')
|
.trim_end_matches(|c| c == '\r' || c == '\n')
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
// 调试:打印原始响应
|
|
||||||
{
|
|
||||||
let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f");
|
|
||||||
log_print!("{} [升级确认] 收到原始响应: {:?}", ts, response);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 解析 {"Type":"UpgradeResponse","Approved":true/false}
|
// 解析 {"Type":"UpgradeResponse","Approved":true/false}
|
||||||
if let Some(start) = response.find("\"Approved\":") {
|
if let Some(start) = response.find("\"Approved\":") {
|
||||||
// "Approved": 共11个字符,true/false 从 start+11 开始
|
// "Approved": 共11个字符,true/false 从 start+11 开始
|
||||||
@@ -1737,15 +1719,10 @@ fn connect_and_wait_response(
|
|||||||
/// 通知所有升级了的应用(EasyTest 等)
|
/// 通知所有升级了的应用(EasyTest 等)
|
||||||
/// app_upgrades: Vec<(app_name, current_ver, latest_ver, exe_path)>
|
/// app_upgrades: Vec<(app_name, current_ver, latest_ver, exe_path)>
|
||||||
fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _debug: bool) {
|
fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _debug: bool) {
|
||||||
let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f");
|
|
||||||
|
|
||||||
if app_upgrades.is_empty() {
|
if app_upgrades.is_empty() {
|
||||||
log_print!("{} [升级确认] 没有应用需要升级通知(upgraded_apps 为空)", ts);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
log_print!("{} [升级确认] 准备通知 {} 个应用: {:?}", ts, app_upgrades.len(), app_upgrades);
|
|
||||||
|
|
||||||
for (app_name, current_ver, latest_ver, exe_path) in app_upgrades {
|
for (app_name, current_ver, latest_ver, exe_path) in app_upgrades {
|
||||||
// 发送升级确认消息,等待用户响应
|
// 发送升级确认消息,等待用户响应
|
||||||
let approved = notify_app_upgrade(app_name, current_ver, latest_ver, true);
|
let approved = notify_app_upgrade(app_name, current_ver, latest_ver, true);
|
||||||
@@ -1753,7 +1730,6 @@ fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _d
|
|||||||
// 用户批准升级后,等待应用退出,然后复制文件并重启
|
// 用户批准升级后,等待应用退出,然后复制文件并重启
|
||||||
if approved {
|
if approved {
|
||||||
// 等待应用退出(最多 15 秒)
|
// 等待应用退出(最多 15 秒)
|
||||||
log_print!("{} [升级确认] 等待 {} 退出...", ts, app_name);
|
|
||||||
let start = std::time::Instant::now();
|
let start = std::time::Instant::now();
|
||||||
let mut exited = false;
|
let mut exited = false;
|
||||||
|
|
||||||
@@ -1771,7 +1747,6 @@ fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _d
|
|||||||
}
|
}
|
||||||
|
|
||||||
if start.elapsed().as_secs() > 15 {
|
if start.elapsed().as_secs() > 15 {
|
||||||
log_print!("{} [升级确认] 等待退出超时,跳过", ts);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user