back out the SIGINT attempt (#748)

openziti · Sep 24, 2024 · 123a4ef · 123a4ef
1 parent 9cf5787
commit 123a4ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/agent/proctree/impl_posix.go b/agent/proctree/impl_posix.go
@@ -5,7 +5,6 @@ package proctree
 import (
 	"os/exec"
 	"sync"
-	"syscall"
 )
 
 func Init(_ string) error {
@@ -53,7 +52,7 @@ func WaitChild(c *Child) error {
 }
 
 func StopChild(c *Child) error {
-	if err := syscall.Kill(c.cmd.Process.Pid, syscall.SIGINT); err != nil {
+	if err := c.cmd.Process.Kill(); err != nil {
 		return err
 	}
 	return nil

diff --git a/agent/proctree/impl_windows.go b/agent/proctree/impl_windows.go
@@ -71,23 +71,7 @@ func WaitChild(c *Child) error {
 }
 
 func StopChild(c *Child) error {
-	if err := sendSigInt(c); err != nil {
-		return err
-	}
-	return nil
-}
-
-func sendSigInt(c *Child) error {
-	dll, err := syscall.LoadDLL("kernel32.dll")
-	if er != nil {
-		return err
-	}
-	proc, err := dll.FindProc("GenerateConsoleCtrlEvent")
-	if err != nil {
-		return err
-	}
-	r, _, err := proc.Call(syscall.CTRL_BREAK_EVENT, uintptr(c.cmd.Process.Pid))
-	if err != nil {
+	if err := c.cmd.Process.Kill(); err != nil {
 		return err
 	}
 	return nil