kill cmd support windows

flashcatcloud · May 31, 2022 · e635f21 · e635f21
1 parent 9381bfa
commit e635f21
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/agentd/timer/cmd_nix.go b/src/agentd/timer/cmd_nix.go
@@ -12,3 +12,7 @@ func CmdStart(cmd *exec.Cmd) error {
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	return cmd.Start()
 }
+
+func CmdKill(cmd *exec.Cmd) error {
+	return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
+}
diff --git a/src/agentd/timer/cmd_windows.go b/src/agentd/timer/cmd_windows.go
@@ -6,3 +6,7 @@ package timer
 func CmdStart(cmd *exec.Cmd) error {
 	return cmd.Start()
 }
+
+func CmdKill(cmd *exec.Cmd) error {
+	return cmd.Process.Kill()
+}
diff --git a/src/agentd/timer/task.go b/src/agentd/timer/task.go
@@ -9,7 +9,6 @@ import (
 	"path"
 	"strings"
 	"sync"
-	"syscall"
 
 	"github.com/toolkits/pkg/file"
 	"github.com/toolkits/pkg/runner"
@@ -298,7 +297,7 @@ func killProcess(t *Task) {
 
 	log.Printf("D: begin kill process of task[%d]", t.Id)
 
-	err := syscall.Kill(-t.Cmd.Process.Pid, syscall.SIGKILL)
+	err := CmdKill(t.Cmd)
 	if err != nil {
 		t.SetStatus("killfailed")
 		log.Printf("D: kill process of task[%d] fail: %v", t.Id, err)