Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-03-11 13:23:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix shutdown logic for macos/linux (#1128)

Browse Source
This commit is contained in:
Mike Sawka 2024-10-24 16:07:18 -07:00 committed by GitHub
parent 2f5c4a6da7
commit 7a90754377
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/shellexec/conninterface.go
View File

@ -4,6 +4,8 @@ import (
"io" "io"
"os" "os"
"os/exec" "os/exec"
"runtime"
"syscall"
"time" "time"
"github.com/creack/pty" "github.com/creack/pty"
@ -42,7 +44,11 @@ func (cw CmdWrap) KillGraceful(timeout time.Duration) {
if cw.Cmd.ProcessState != nil && cw.Cmd.ProcessState.Exited() { if cw.Cmd.ProcessState != nil && cw.Cmd.ProcessState.Exited() {
return return
} }
cw.Cmd.Process.Signal(os.Interrupt) if runtime.GOOS == "windows" {
cw.Cmd.Process.Signal(os.Interrupt)
} else {
cw.Cmd.Process.Signal(syscall.SIGTERM)
}
go func() { go func() {
time.Sleep(timeout) time.Sleep(timeout)
if cw.Cmd.ProcessState == nil || !cw.Cmd.ProcessState.Exited() { if cw.Cmd.ProcessState == nil || !cw.Cmd.ProcessState.Exited() {