Fix cancel

kylecarbs · kylecarbs · commit c4d3cb8a950d · 2023-09-21T14:10:49.000Z
diff --git a/agent/agentscripts/agentscripts.go b/agent/agentscripts/agentscripts.go
@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"sync"
 	"sync/atomic"
-	"syscall"
 	"time"
 
 	"github.com/robfig/cron/v3"
@@ -157,9 +156,7 @@ func (r *Runner) run(ctx context.Context, script codersdk.WorkspaceAgentScript)
 	cmd := cmdPty.AsExec()
 	cmd.SysProcAttr = cmdSysProcAttr()
 	cmd.WaitDelay = script.TimeoutSeconds + (10 * time.Second)
-	cmd.Cancel = func() error {
-		return syscall.Kill(-cmd.Process.Pid, syscall.SIGINT)
-	}
+	cmd.Cancel = cmdCancel(cmd)
 
 	send, flushAndClose := agentsdk.LogsSender(script.LogSourceID, r.PatchLogs, logger)
 	// If ctx is canceled here (or in a writer below), we may be
diff --git a/agent/agentscripts/agentscripts_other.go b/agent/agentscripts/agentscripts_other.go
@@ -2,10 +2,19 @@
 
 package agentscripts
 
-import "syscall"
+import (
+	"os/exec"
+	"syscall"
+)
 
 func cmdSysProcAttr() *syscall.SysProcAttr {
 	return &syscall.SysProcAttr{
 		Setsid: true,
 	}
 }
+
+func cmdCancel(cmd *exec.Cmd) func() error {
+	return func() error {
+		return syscall.Kill(-cmd.Process.Pid, syscall.SIGINT)
+	}
+}
diff --git a/agent/agentscripts/agentscripts_windows.go b/agent/agentscripts/agentscripts_windows.go
@@ -1,7 +1,16 @@
 package agentscripts
 
-import "syscall"
+import (
+	"os/exec"
+	"syscall"
+)
 
 func cmdSysProcAttr() *syscall.SysProcAttr {
 	return &syscall.SysProcAttr{}
 }
+
+func cmdCancel(cmd *exec.Cmd) func() error {
+	return func() error {
+		return nil
+	}
+}
