update: avoid zombie process when restarting into update bin

ConSol-Monitoring · Jun 12, 2024 · b32af9c · b32af9c
1 parent 66afbdf
commit b32af9c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/pkg/snclient/snclient_unix.go b/pkg/snclient/snclient_unix.go
@@ -81,7 +81,18 @@ func (snc *Agent) finishUpdate(binPath, mode string) {
 	if mode == "update" {
 		cmd := exec.Command(binPath, "update", "apply")
 		cmd.Env = os.Environ()
-		_ = cmd.Start()
+		err := cmd.Start()
+		if err != nil {
+			log.Errorf("failed to start update apply: %s", err.Error())
+
+			return
+		}
+		go func() {
+			err := cmd.Wait()
+			if err != nil {
+				log.Errorf("update apply failed: %s", err.Error())
+			}
+		}()
 
 		return
 	}

diff --git a/pkg/snclient/snclient_windows.go b/pkg/snclient/snclient_windows.go
@@ -124,7 +124,18 @@ func (snc *Agent) finishUpdate(binPath, mode string) {
 	if mode == "update" {
 		cmd := exec.Command(binPath, "update", "apply")
 		cmd.Env = os.Environ()
-		_ = cmd.Start()
+		err := cmd.Start()
+		if err != nil {
+			log.Errorf("failed to start update apply: %s", err.Error())
+
+			return
+		}
+		go func() {
+			err := cmd.Wait()
+			if err != nil {
+				log.Errorf("update apply failed: %s", err.Error())
+			}
+		}()
 
 		return
 	}

diff --git a/pkg/snclient/task_updates.go b/pkg/snclient/task_updates.go
@@ -761,6 +761,12 @@ func (u *UpdateHandler) Apply(bin string) error {
 	if err != nil {
 		return fmt.Errorf("starting updater failed: %s", err.Error())
 	}
+	go func() {
+		err := cmd.Wait()
+		if err != nil {
+			log.Errorf("update failed: %s", err.Error())
+		}
+	}()
 
 	return nil
 }