tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Server Status Changes

Browse source 
- refactored the code to stop the server status cycling and to be more accurate.
This commit is contained in:
Brett Hewitson 2022-07-15 22:36:13 +10:00
parent c79ec023d8
commit 9e52ccbaa1
15 changed files with 321 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/ConanServerManager/Lib/ServerStatusWatcher.cs
View file

@ -150,52 +150,52 @@ namespace ServerManagerTool.Lib
var currentStatus = WatcherServerStatus.Initializing;
//
// If the process was running do we then perform network checks.
//
Logger.Info($"{nameof(DoServerStatusUpdateAsync)} Checking server local network status at {registration.LocalEndpoint}");
Logger.Info($"{nameof(DoServerStatusUpdateAsync)} Checking server local (directly) status at {registration.LocalEndpoint}");
// get the server information direct from the server using local connection.
// get the server information direct from the server using local endpoint.
var serverStatus = GetLocalNetworkStatus(registration.LocalEndpoint, out ServerInfo localInfo, out int onlinePlayerCount);
if (serverStatus)
{
currentStatus = WatcherServerStatus.RunningLocalCheck;
currentStatus = WatcherServerStatus.LocalSuccess;
//
// Now that it's running, we can check the publication status.
//
Logger.Info($"{nameof(DoServerStatusUpdateAsync)} Checking server public (directly) status at {registration.PublicEndpoint}");
// get the server information direct from the server using public connection.
// get the server information direct from the server using public endpoint.
serverStatus = GetPublicNetworkStatusDirectly(registration.PublicEndpoint);
// check if the server returned the information.
if (!serverStatus)
if (serverStatus)
{
_nextExternalStatusQuery[registrationKey] = DateTime.MinValue;
currentStatus = WatcherServerStatus.Published;
}
else if (!string.IsNullOrWhiteSpace(Config.Default.ServerStatusUrlFormat))
{
// server did not return any information
var nextExternalStatusQuery = _nextExternalStatusQuery.ContainsKey(registrationKey) ? _nextExternalStatusQuery[registrationKey] : DateTime.MinValue;
if (DateTime.Now >= nextExternalStatusQuery)
{
currentStatus = WatcherServerStatus.RunningExternalCheck;
Logger.Info($"{nameof(DoServerStatusUpdateAsync)} Checking server public (externally) status at {registration.PublicEndpoint}");
if (!string.IsNullOrWhiteSpace(Config.Default.ServerStatusUrlFormat))
// get the server information direct from the server using external endpoint.
var url = string.Format(Config.Default.ServerStatusUrlFormat, Config.Default.ServerManagerCode, App.Instance.Version, registration.PublicEndpoint.Address, registration.PublicEndpoint.Port);
var uri = new Uri(url);
serverStatus = await GetPublicNetworkStatusViaAPIAsync(uri, registration.PublicEndpoint);
var remoteStatusQueryDelay = serverStatus
? Config.Default.ServerStatusWatcher_RemoteStatusQueryDelay
: 15000;
_nextExternalStatusQuery[registrationKey] = DateTime.Now.AddMilliseconds(remoteStatusQueryDelay);
if (serverStatus)
{
Logger.Info($"{nameof(DoServerStatusUpdateAsync)} Checking server public (via api) status at {registration.PublicEndpoint}");
// get the server information direct from the server using external connection.
var uri = new Uri(string.Format(Config.Default.ServerStatusUrlFormat, Config.Default.ServerManagerCode, App.Instance.Version, registration.PublicEndpoint.Address, registration.PublicEndpoint.Port));
serverStatus = await GetPublicNetworkStatusViaAPIAsync(uri, registration.PublicEndpoint);
currentStatus = WatcherServerStatus.ExternalSuccess;
}
_nextExternalStatusQuery[registrationKey] = DateTime.Now.AddMilliseconds(Config.Default.ServerStatusWatcher_RemoteStatusQueryDelay);
}
}
// check if the server returned the information.
if (serverStatus)
{
currentStatus = WatcherServerStatus.Published;
else
{
currentStatus = WatcherServerStatus.ExternalSkipped;
}
}
}