From 7415005d6ecfb7ed9dd6aba1d12edaf904c028b4 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 3 Sep 2024 23:22:31 -0400 Subject: [PATCH] Client count is unsigned for the love of god --- .../Models/Internal/DreamDaemonApiBase.cs | 2 +- .../Components/Interop/Topic/TopicResponse.cs | 2 +- src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs | 2 +- src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs | 2 +- tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tgstation.Server.Api/Models/Internal/DreamDaemonApiBase.cs b/src/Tgstation.Server.Api/Models/Internal/DreamDaemonApiBase.cs index e3411b8115..c0c6f63374 100644 --- a/src/Tgstation.Server.Api/Models/Internal/DreamDaemonApiBase.cs +++ b/src/Tgstation.Server.Api/Models/Internal/DreamDaemonApiBase.cs @@ -23,7 +23,7 @@ namespace Tgstation.Server.Api.Models.Internal /// The last known count of connected players. Requires to not be 0 and a game server interop version >= 5.10.0 to populate. /// [ResponseOptions] - public int? ClientCount { get; set; } + public uint? ClientCount { get; set; } /// /// If the server is undergoing a soft reset. This may be automatically set by changes to other fields. diff --git a/src/Tgstation.Server.Host/Components/Interop/Topic/TopicResponse.cs b/src/Tgstation.Server.Host/Components/Interop/Topic/TopicResponse.cs index 45bae93f75..a374bd6750 100644 --- a/src/Tgstation.Server.Host/Components/Interop/Topic/TopicResponse.cs +++ b/src/Tgstation.Server.Host/Components/Interop/Topic/TopicResponse.cs @@ -40,6 +40,6 @@ namespace Tgstation.Server.Host.Components.Interop.Topic /// /// The number of connected clients to the game. Added in Interop 5.10.0. /// - public int? ClientCount { get; set; } + public uint? ClientCount { get; set; } } } diff --git a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs index 35da1504f8..c1dd923c00 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs @@ -27,7 +27,7 @@ namespace Tgstation.Server.Host.Components.Watchdog /// /// Last known client count queried from the DMAPI. Requires health checks to be enabled to populate. /// - int? ClientCount { get; } + uint? ClientCount { get; } /// /// The current . diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs index 3c67ca495c..e0aff03f40 100644 --- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs +++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs @@ -39,7 +39,7 @@ namespace Tgstation.Server.Host.Components.Watchdog public long? SessionId => GetActiveController()?.ReattachInformation.Id; /// - public int? ClientCount { get; private set; } + public uint? ClientCount { get; private set; } /// public DateTimeOffset? LaunchTime => GetActiveController()?.LaunchTime; diff --git a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs index d7930e0cc6..2966ec20e6 100644 --- a/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs @@ -754,7 +754,7 @@ namespace Tgstation.Server.Tests.Live.Instance Assert.IsTrue(daemonStatus.LaunchTime.Value >= DateTimeOffset.UtcNow.AddHours(-1)); if (daemonStatus.ClientCount.HasValue) - Assert.AreEqual(0, daemonStatus.ClientCount.Value); + Assert.AreEqual(0U, daemonStatus.ClientCount.Value); if (sessionIdTracker.HasValue) if (knownIncrease.HasValue) @@ -865,7 +865,7 @@ namespace Tgstation.Server.Tests.Live.Instance await Task.WhenAny(Task.Delay(7000, cancellationToken), ourProcessHandler.Lifetime); Assert.IsFalse(ddProc.HasExited); var daemonStatus = await instanceClient.DreamDaemon.Read(cancellationToken); - Assert.AreEqual(0, daemonStatus.ClientCount); + Assert.AreEqual(0U, daemonStatus.ClientCount); // check DD agrees var topicRequestResult = await SendTestTopic(