prevent goleak, docs

mafredri · mafredri · commit cbd62e0b1486 · 2025-04-07T08:21:29.000Z
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -1060,8 +1060,10 @@ func (s *Server) Close() error {
 	// Guard against multiple calls to Close and
 	// accepting new connections during close.
 	if s.closing != nil {
+		closing := s.closing
 		s.mu.Unlock()
-		return xerrors.New("server is closing")
+		<-closing
+		return xerrors.New("server is closed")
 	}
 	s.closing = make(chan struct{})
 
diff --git a/agent/agentssh/exec_windows.go b/agent/agentssh/exec_windows.go
@@ -15,7 +15,11 @@ func cmdSysProcAttr() *syscall.SysProcAttr {
 func cmdCancel(ctx context.Context, logger slog.Logger, cmd *exec.Cmd) func() error {
 	return func() error {
 		logger.Debug(ctx, "cmdCancel: killing process", slog.F("pid", cmd.Process.Pid))
+		// Windows doesn't support sending signals to process groups, so we
+		// have to kill the process directly. In the future, we may want to
+		// implement a more sophisticated solution for process groups on
+		// Windows, but for now, this is a simple way to ensure that the
+		// process is terminated when the context is cancelled.
 		return cmd.Process.Kill()
-		// return cmd.Process.Signal(os.Interrupt)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,11 @@ func cmdSysProcAttr() *syscall.SysProcAttr {`
`15`	`15`	`func cmdCancel(ctx context.Context, logger slog.Logger, cmd *exec.Cmd) func() error {`
`16`	`16`	`return func() error {`
`17`	`17`	`logger.Debug(ctx, "cmdCancel: killing process", slog.F("pid", cmd.Process.Pid))`
	`18`	`+ // Windows doesn't support sending signals to process groups, so we`
	`19`	`+ // have to kill the process directly. In the future, we may want to`
	`20`	`+ // implement a more sophisticated solution for process groups on`
	`21`	`+ // Windows, but for now, this is a simple way to ensure that the`
	`22`	`+ // process is terminated when the context is cancelled.`
`18`	`23`	`return cmd.Process.Kill()`
`19`		`- // return cmd.Process.Signal(os.Interrupt)`
`20`	`24`	`}`
`21`	`25`	`}`