Skip to content

fix: avoid nested tokio runtime panic in --reuse flag #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hossihub wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid nested tokio runtime panic in --reuse flag #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/mcp/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,11 +505,8 @@ impl MCPServer {
// (PID recycling can cause false positives with kill -0 alone)
if Self::is_process_alive(pid) {
// Verify the server is actually running by checking health endpoint
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.map_err(|e| format!("Failed to create tokio runtime: {}", e))?;
let alive = rt.block_on(Self::check_health_sync(port));
// Use run_blocking() — never create a new Runtime inside an existing one
let alive = crate::runtime::run_blocking(Self::check_health_sync(port));
if alive {
return Ok(Some(pid));
}
Expand Down Expand Up @@ -901,7 +898,7 @@ impl MCPServer {
if pid_file.exists() {
if let Ok(contents) = fs::read_to_string(&pid_file) {
if let Ok(pid) = contents.trim().parse::<u32>() {
if pid == std::process::id() as u32 {
if pid == std::process::id() {
let _ = fs::remove_file(&pid_file);
tracing::info!("Removed PID file");
}
Expand Down
Loading