Pass command as parameter into processWaitQuit

Signed-off-by: Tom Wieczorek <[email protected]>

Author: twz123

pkg/supervisor/supervisor.go

@@ -54,10 +54,10 @@ const k0sManaged = "_K0S_MANAGED=yes"
 
 // processWaitQuit waits for a process to exit or a shut down signal
 // returns true if shutdown is requested
-func (s *Supervisor) processWaitQuit(ctx context.Context) bool {
+func (s *Supervisor) processWaitQuit(ctx context.Context, cmd *exec.Cmd) bool {
 	waitresult := make(chan error)
 	go func() {
-		waitresult <- s.cmd.Wait()
+		waitresult <- cmd.Wait()
 	}()
 
 	defer os.Remove(s.PidFile)
@@ -66,7 +66,7 @@ func (s *Supervisor) processWaitQuit(ctx context.Context) bool {
 	case <-ctx.Done():
 		for {
 			s.log.Debug("Requesting graceful termination")
-			if err := requestGracefulTermination(s.cmd.Process); err != nil {
+			if err := requestGracefulTermination(cmd.Process); err != nil {
 				if errors.Is(err, os.ErrProcessDone) {
 					s.log.Info("Failed to request graceful termination: process has already terminated")
 				} else {
@@ -91,7 +91,7 @@ func (s *Supervisor) processWaitQuit(ctx context.Context) bool {
 		if err != nil {
 			s.log.WithError(err).Warn("Failed to wait for process")
 		} else {
-			s.log.Warnf("Process exited: ", s.cmd.ProcessState)
+			s.log.Warnf("Process exited: ", cmd.ProcessState)
 		}
 	}
 	return false
@@ -182,7 +182,7 @@ func (s *Supervisor) Supervise() error {
 					s.log.Infof("Restarted (%d)", restarts)
 				}
 				restarts++
-				if s.processWaitQuit(ctx) {
+				if s.processWaitQuit(ctx, s.cmd) {
 					return
 				}
 			}