Process rewrite

process/process.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"os/exec"
 	"sync"
 )
@@ -60,15 +61,19 @@ func (pm *ProcessManager) GetExecutes() []string {
 
 func printSubProcess(ctx context.Context, pipe io.ReadCloser) {
 	scanner := bufio.NewScanner(pipe)
-	defer pipe.Close()
 	for {
 		select {
 		case <-ctx.Done():
+			slog.Debug("Context closed, stopping printSubProcess")
 			return
 		default:
-			if scanner.Scan() {
-				fmt.Println(scanner.Text())
+			if !scanner.Scan() {
+				if err := scanner.Err(); err != nil {
+					slog.Debug("Scanner error", "err", err)
+				}
+				return
 			}
+			fmt.Println(scanner.Text())
 		}
 	}
 }

process/process_unix.go

@@ -75,6 +75,8 @@ func (pm *ProcessManager) StartProcess(ctx context.Context, cancel context.Cance
 				cancel()
 				return
 			}
+			slog.Debug("Process completed closing context", "exec", p.Exec)
+			ctx.Done()
 		} else {
 			cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 			cmd.Stderr = os.Stderr
@@ -98,17 +100,22 @@ func (pm *ProcessManager) StartProcess(ctx context.Context, cancel context.Cance
 			// slog.Debug("Stored Process Context", "exec", p.Exec)
 
 			go func() {
+				errCh := make(chan error, 1)
+				go func() {
+					errCh <- cmd.Wait()
+				}()
 				select {
 				case <-processCtx.Done():
 					_ = syscall.Kill(-p.pid, syscall.SIGKILL)
 				case <-ctx.Done():
 					slog.Debug("Context closed", "exec", p.Exec)
 					_ = syscall.Kill(-p.pid, syscall.SIGKILL)
-				default:
-					err := cmd.Wait()
+				case err := <-errCh:
 					if err != nil {
 						cancel()
 					}
+					slog.Debug("Process Errored closing context", "exec", p.Exec)
+					ctx.Done()
 					delete(pm.Ctxs, p.Exec)
 					delete(pm.Cancels, p.Exec)
 				}
@@ -124,14 +131,15 @@ func (pm *ProcessManager) StartProcess(ctx context.Context, cancel context.Cance
 
 func (pm *ProcessManager) KillProcesses() {
 	for _, p := range pm.Processes {
-		// slog.Debug("Killing Process", "exec", p.Exec, "pid", p.pid)
 		if p.pid != 0 {
 			_, err := os.FindProcess(p.pid)
 			if err != nil {
-				// slog.Debug("Process not running", "exec", p.Exec)
 				continue
 			}
 			syscall.Kill(-p.pid, syscall.SIGKILL)
+			if cancel, ok := pm.Cancels[p.Exec]; ok {
+				cancel()
+			}
 		}
 	}
 }

process/process_windows.go

@@ -86,16 +86,15 @@ func (pm *ProcessManager) StartProcess(ctx context.Context, cancel context.Cance
 				return
 			}
 		} else {
+			cmd.Stderr = os.Stderr
+			p.logPipe, err = cmd.StdoutPipe()
+			go printSubProcess(ctx, p.logPipe)
 			err = cmd.Start()
+			if err != nil {
+				slog.Error("Getting Stdout Pipe", "exec", p.Exec, "err", err)
+			}
 			if cmd.Process != nil {
-				cmd.Stderr = os.Stderr
-				p.logPipe, err = cmd.StdoutPipe()
-				if err != nil {
-					slog.Error("Getting Stdout Pipe", "exec", p.Exec, "err", err)
-				}
-				go printSubProcess(ctx, p.logPipe)
 				p.pid = cmd.Process.Pid
-
 				processCtx, processCancel := context.WithCancel(ctx)
 				pm.Ctxs[p.Exec] = processCtx
 				pm.Cancels[p.Exec] = processCancel