Fix: improved killing of internal processes

Author: luskaner

launcher-config/internal/admin_other.go

@@ -20,8 +20,7 @@ func preAgentStart() {
 func postAgentStart(file string) {
 	if !executor.IsAdmin() {
 		for i := 0; i < 30; i++ {
-			_, proc, _ := process.Process(file)
-			if proc != nil {
+			if _, proc, err := process.Process(file); err == nil && proc != nil {
 				break
 			}
 			time.Sleep(time.Second)

launcher-config/internal/cmd/revert.go

@@ -236,10 +236,9 @@ var revertCmd = &cobra.Command{
 			}
 			if failedStopAgent {
 				exeFileName := common.GetExeFileName(true, common.LauncherConfigAdminAgent)
-				if _, _, err := commonProcess.Process(exeFileName); err == nil {
+				if pid, proc, err := commonProcess.Process(exeFileName); err == nil {
 					if isAdmin {
-						_, err := commonProcess.Kill(exeFileName)
-						if err == nil {
+						if err := commonProcess.KillProc(pid, proc); err == nil {
 							fmt.Println("Successfully killed 'config-admin-agent'.")
 							failedStopAgent = false
 						} else {
@@ -248,6 +247,8 @@ var revertCmd = &cobra.Command{
 					} else {
 						fmt.Println("Re-run as administrator to kill 'config-admin-agent'")
 					}
+				} else {
+					failedStopAgent = false
 				}
 			}
 			if failedStopAgent && errorCode == common.ErrSuccess {

launcher/internal/cmd/root.go

@@ -210,15 +210,15 @@ var (
 			}
 			fmt.Println(`...`)
 			if revertResult := executor.RunRevert(gameId, true, runtime.GOOS == "windows", true, true, true, true, false); !revertResult.Success() {
-				if _, _, err = commonProcess.Process(common.GetExeFileName(false, common.LauncherConfigAdminAgent)); err == nil {
+				if _, proc, err = commonProcess.Process(common.GetExeFileName(false, common.LauncherConfigAdminAgent)); err == nil && proc != nil {
 					fmt.Println("Failed to kill 'config-admin-agent' process: ", err, "Kill it using the task manager with admin rights.")
 				} else {
 					fmt.Println("Failed to cleanup configuration, try to remove certificates and/or host mappings manually.")
 				}
 				return
 			}
 			pidPath, proc, err = commonProcess.Process(common.GetExeFileName(false, common.Server))
-			if err == nil && proc != nil && pidPath != "" {
+			if err == nil && proc != nil {
 				fmt.Println("'Server' is already running, If you did not start it manually, kill the 'server' process using the task manager and execute the 'launcher' again.")
 			}
 			defer func() {