From 2f1c559d33e4ac57334f46ed016ba05e8af09ec5 Mon Sep 17 00:00:00 2001 From: shadow Date: Thu, 14 May 2026 15:57:46 +0800 Subject: [PATCH] fix --- src/cli/init.rs | 2 +- src/cli/transport.rs | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/cli/init.rs b/src/cli/init.rs index fb1a333..dd5a0a7 100644 --- a/src/cli/init.rs +++ b/src/cli/init.rs @@ -120,7 +120,7 @@ pub fn cmd_init(force: bool) -> Result<()> { println!("配置已保存: {}", config_path.display()); // init 之后必须停掉旧 daemon(它用的是旧 config),下次调用会自动重启 - let _ = crate::cli::transport::stop_daemon(); + let _ = stop_daemon(); println!("初始化完成,可以使用 wx sessions / wx history 等命令了"); diff --git a/src/cli/transport.rs b/src/cli/transport.rs index 05d1a38..2a4624a 100644 --- a/src/cli/transport.rs +++ b/src/cli/transport.rs @@ -124,31 +124,6 @@ pub fn ensure_daemon() -> Result<()> { Ok(()) } -/// 停止 daemon(如果正在运行) -pub fn stop_daemon() -> Result<()> { - let pid_path = config::pid_path(); - if let Ok(pid_str) = std::fs::read_to_string(&pid_path) { - if let Ok(pid) = pid_str.trim().parse::() { - #[cfg(unix)] - { - let _ = std::process::Command::new("kill") - .arg("-TERM") - .arg(pid.to_string()) - .spawn(); - } - #[cfg(windows)] - { - let _ = std::process::Command::new("taskkill") - .args(["/F", "/PID", &pid.to_string()]) - .spawn(); - } - } - } - let _ = std::fs::remove_file(config::sock_path()); - let _ = std::fs::remove_file(&pid_path); - Ok(()) -} - /// 启动 daemon 前检查 `~/.wx-cli/` 可写,给出比"超时"更明确的错误。 /// /// 典型坑:旧版本 `sudo wx init` 把目录留成 root 属主,非 root 的 daemon