Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

collect data when server offline

Browse Source
This commit is contained in:
RaidMax 2022-03-29 17:18:41 -05:00
parent 7dbdf87728
commit 1e67f6e86c
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Application/IW4MServer.cs
View File

@ -1003,7 +1003,7 @@ namespace IW4MAdmin
{ {
if (!Throttled) if (!Throttled)
{ {
var _event = new GameEvent() var gameEvent = new GameEvent
{ {
Type = GameEvent.EventType.ConnectionLost, Type = GameEvent.EventType.ConnectionLost,
Owner = this, Owner = this,
@ -1013,36 +1013,18 @@ namespace IW4MAdmin
Data = ConnectionErrors.ToString() Data = ConnectionErrors.ToString()
}; };
Manager.AddEvent(_event); Manager.AddEvent(gameEvent);
} }
RunServerCollection();
return true; return true;
} }
LastMessage = DateTime.Now - start; LastMessage = DateTime.Now - start;
lastCount = DateTime.Now; lastCount = DateTime.Now;
var appConfig = _serviceProvider.GetService<ApplicationConfiguration>(); RunServerCollection();
// update the player history
if (lastCount - playerCountStart >= appConfig.ServerDataCollectionInterval)
{
var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
appConfig.ServerDataCollectionInterval.TotalMinutes);
while (ClientHistory.ClientCounts.Count > maxItems)
{
ClientHistory.ClientCounts.RemoveAt(0);
}
ClientHistory.ClientCounts.Add(new ClientCountSnapshot
{
ClientCount = ClientNum,
ConnectionInterrupted = Throttled,
Time = DateTime.UtcNow,
Map = CurrentMap.Name
});
playerCountStart = DateTime.Now;
}
// send out broadcast messages // send out broadcast messages
if (LastMessage.TotalSeconds > Manager.GetApplicationSettings().Configuration().AutoMessagePeriod if (LastMessage.TotalSeconds > Manager.GetApplicationSettings().Configuration().AutoMessagePeriod
@ -1090,6 +1072,34 @@ namespace IW4MAdmin
} }
} }
private void RunServerCollection()
{
var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
if (lastCount - playerCountStart < appConfig?.ServerDataCollectionInterval)
{
return;
}
var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
appConfig.ServerDataCollectionInterval.TotalMinutes);
while (ClientHistory.ClientCounts.Count > maxItems)
{
ClientHistory.ClientCounts.RemoveAt(0);
}
ClientHistory.ClientCounts.Add(new ClientCountSnapshot
{
ClientCount = ClientNum,
ConnectionInterrupted = Throttled,
Time = DateTime.UtcNow,
Map = CurrentMap.Name
});
playerCountStart = DateTime.Now;
}
public async Task Initialize() public async Task Initialize()
{ {
try try

5
SharedLibraryCore/Dtos/ClientHistoryInfo.cs
View File

@ -11,11 +11,8 @@ namespace SharedLibraryCore.Dtos
public class ClientCountSnapshot public class ClientCountSnapshot
{ {
private const int UpdateInterval = 5;
public DateTime Time { get; set; } public DateTime Time { get; set; }
public string TimeString => new DateTime(Time.Year, Time.Month, Time.Day, Time.Hour, public string TimeString => Time.ToString("yyyy-MM-ddTHH:mm:ssZ");
Math.Min(59, UpdateInterval * (int)Math.Round(Time.Minute / (float)UpdateInterval)), 0)
.ToString("yyyy-MM-ddTHH:mm:ssZ");
public int ClientCount { get; set; } public int ClientCount { get; set; }
public bool ConnectionInterrupted { get;set; } public bool ConnectionInterrupted { get;set; }
public string Map { get; set; } public string Map { get; set; }