Added better status detection for stopping servers

This commit is contained in:
Brett Hewitson 2021-12-20 18:37:11 +10:00
parent 034a6228d7
commit 3c822fa982
14 changed files with 183 additions and 46 deletions

View file

@ -257,6 +257,8 @@ namespace ServerManagerTool.Lib
return;
}
ServerStatusChangeCallback?.Invoke(ServerStatus.Stopped);
// make a backup of the current profile and config files.
CreateProfileBackupArchiveFile(_profile);
@ -404,6 +406,7 @@ namespace ServerManagerTool.Lib
}
_serverRunning = true;
ServerStatusChangeCallback?.Invoke(ServerStatus.Stopping);
LogProfileMessage($"Server process found PID {process.Id}.");
QueryMaster.Server gameServer = null;
@ -1165,6 +1168,8 @@ namespace ServerManagerTool.Lib
if (ExitCode != EXITCODE_NORMALEXIT)
return;
ServerStatusChangeCallback?.Invoke(ServerStatus.Stopped);
emailMessage.AppendLine("Update Summary:");
emailMessage.AppendLine();
emailMessage.AppendLine($"Server Manager version: {App.Instance.Version}");
@ -2435,7 +2440,7 @@ namespace ServerManagerTool.Lib
_loggerBranch?.Info(message);
if (includeProgressCallback)
ProgressCallback?.Invoke(0, $"[INFO] {message}");
ProgressCallback?.Invoke(0, $"{message}");
Debug.WriteLine($"[INFO] (Branch {GetBranchName(branchName) ?? "unknown"}) {message}");
}
@ -2460,7 +2465,7 @@ namespace ServerManagerTool.Lib
_loggerProfile?.Info(message);
if (includeProgressCallback)
ProgressCallback?.Invoke(0, $"[INFO] {message}");
ProgressCallback?.Invoke(0, $"{message}");
Debug.WriteLine($"[INFO] (Profile {_profile?.ProfileName ?? "unknown"}) {message}");
}
@ -2709,6 +2714,8 @@ namespace ServerManagerTool.Lib
}
}
ServerStatusChangeCallback?.Invoke(ServerStatus.Unknown);
LogProfileMessage("");
LogProfileMessage($"Exitcode = {ExitCode}");
return ExitCode;
@ -2806,6 +2813,8 @@ namespace ServerManagerTool.Lib
}
}
ServerStatusChangeCallback?.Invoke(ServerStatus.Unknown);
LogProfileMessage("");
LogProfileMessage($"Exitcode = {ExitCode}");
return ExitCode;
@ -2886,6 +2895,8 @@ namespace ServerManagerTool.Lib
}
}
ServerStatusChangeCallback?.Invoke(ServerStatus.Unknown);
LogProfileMessage("");
LogProfileMessage($"Exitcode = {ExitCode}");
return ExitCode;