opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(backend): correct gateway status detection on Windows

Browse source
This commit is contained in:
wenjie 2026-03-09 19:20:44 +08:00
parent a418554441
commit f7f7445ba6
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
web/backend/api/gateway.go
View file

@ -107,9 +107,26 @@ func lookupModelConfig(cfg *config.Config, modelName string) *config.ModelConfig
} }
func isGatewayProcessAliveLocked() bool { func isGatewayProcessAliveLocked() bool {
return gateway.cmd != nil && return isCmdProcessAliveLocked(gateway.cmd)
gateway.cmd.Process != nil && }
gateway.cmd.Process.Signal(syscall.Signal(0)) == nil
func isCmdProcessAliveLocked(cmd *exec.Cmd) bool {
if cmd == nil || cmd.Process == nil {
return false
}
// Wait() sets ProcessState when the process exits; use it when available.
if cmd.ProcessState != nil && cmd.ProcessState.Exited() {
return false
}
// Windows does not support Signal(0) probing. If we still own cmd and it
// has not reported exit, treat it as alive.
if runtime.GOOS == "windows" {
return true
}
return cmd.Process.Signal(syscall.Signal(0)) == nil
} }
func (h *Handler) startGatewayLocked() (int, error) { func (h *Handler) startGatewayLocked() (int, error) {
@ -308,7 +325,7 @@ func (h *Handler) handleGatewayRestart(w http.ResponseWriter, r *http.Request) {
// Stop existing process if running // Stop existing process if running
if gateway.cmd != nil && gateway.cmd.Process != nil { if gateway.cmd != nil && gateway.cmd.Process != nil {
if err := gateway.cmd.Process.Signal(syscall.Signal(0)); err == nil { if isCmdProcessAliveLocked(gateway.cmd) {
// Process is alive, send SIGTERM // Process is alive, send SIGTERM
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
gateway.cmd.Process.Kill() gateway.cmd.Process.Kill()
@ -338,12 +355,9 @@ func (h *Handler) handleGatewayStatus(w http.ResponseWriter, r *http.Request) {
// Check process state // Check process state
gateway.mu.Lock() gateway.mu.Lock()
processAlive := false processAlive := isGatewayProcessAliveLocked()
if gateway.cmd != nil && gateway.cmd.Process != nil { if processAlive {
if err := gateway.cmd.Process.Signal(syscall.Signal(0)); err == nil { data["pid"] = gateway.cmd.Process.Pid
processAlive = true
data["pid"] = gateway.cmd.Process.Pid
}
} }
gateway.mu.Unlock() gateway.mu.Unlock()
@ -495,11 +509,9 @@ func (h *Handler) currentGatewayStatus() string {
data := map[string]any{ data := map[string]any{
"gateway_status": "stopped", "gateway_status": "stopped",
} }
if gateway.cmd != nil && gateway.cmd.Process != nil { if isGatewayProcessAliveLocked() {
if err := gateway.cmd.Process.Signal(syscall.Signal(0)); err == nil { data["gateway_status"] = "running"
data["gateway_status"] = "running" data["pid"] = gateway.cmd.Process.Pid
data["pid"] = gateway.cmd.Process.Pid
}
} }
ready, reason, readyErr := h.gatewayStartReady() ready, reason, readyErr := h.gatewayStartReady()