Change OS specific command behavior defaults

Signed-off-by: Christian Kruse <[email protected]>

pkg/receiver/jobreceiver/command/command.go

@@ -41,6 +41,8 @@ func NewExecution(ctx context.Context, request ExecutionRequest) *Execution {
 	if len(request.Env) > 0 {
 		cmd.Env = request.Env
 	}
+
+	setOptions(cmd)
 	return &Execution{
 		cmd:     cmd,
 		ctx:     ctx,
@@ -120,10 +122,3 @@ type ExecutionResponse struct {
 	// Error is passed when the outcome of the execution is uncertain
 	Error error
 }
-
-// cError const error type for sentinels
-type cError string
-
-func (e cError) Error() string {
-	return string(e)
-}

pkg/receiver/jobreceiver/command/exec_linux.go

@@ -0,0 +1,15 @@
+package command
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+// setOptions sets the process group of the command processprocgroup
+func setOptions(cmd *exec.Cmd) {
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Pdeathsig: syscall.SIGTERM}
+	cmd.Cancel = func() error {
+		// Kill process group instead
+		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
+	}
+}

pkg/receiver/jobreceiver/command/exec_unix.go

@@ -0,0 +1,18 @@
+//go:build !linux && !windows
+// +build !linux,!windows
+
+package command
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+// setOptions sets the process group of the command process
+func setOptions(cmd *exec.Cmd) {
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
+	cmd.Cancel = func() error {
+		// Kill process group instead
+		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
+	}
+}

pkg/receiver/jobreceiver/command/exec_windows.go

@@ -0,0 +1,26 @@
+package command
+
+import (
+	"fmt"
+	"os/exec"
+	"syscall"
+)
+
+// setOptions sets the process group of the command process
+func setOptions(cmd *exec.Cmd) {
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP,
+	}
+	cmd.Cancel = func() error {
+		// Try with taskkill first
+		taskkill := exec.Command(
+			"taskkill",
+			"/T", "/F", "/PID", fmt.Sprint(cmd.Process.Pid),
+		)
+		if err := taskkill.Run(); err == nil {
+			return nil
+		}
+		// Fall back to the default behavior
+		return cmd.Process.Kill()
+	}
+}