Don't consider startup timeout as a launch parameter

This commit is contained in:
Cyberboss
2020-05-31 12:09:13 -04:00
parent b8e766ba07
commit b8047a5585
2 changed files with 4 additions and 5 deletions
+2 -2
View File
@@ -3,8 +3,8 @@
<!-- This is the authorative version list -->
<!-- Integration tests will ensure they match across the board -->
<TgsCoreVersion>4.3.0</TgsCoreVersion>
<TgsApiVersion>6.5.0</TgsApiVersion>
<TgsClientVersion>7.1.0</TgsClientVersion>
<TgsApiVersion>6.5.1</TgsApiVersion>
<TgsClientVersion>7.1.1</TgsClientVersion>
<TgsDmapiVersion>5.2.2</TgsDmapiVersion>
<TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
<TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
@@ -48,7 +48,7 @@ namespace Tgstation.Server.Api.Models.Internal
public uint? HeartbeatSeconds { get; set; }
/// <summary>
/// Check if we match a given set of <paramref name="otherParameters"/>
/// Check if we match a given set of <paramref name="otherParameters"/>. <see cref="StartupTimeout"/> is excluded.
/// </summary>
/// <param name="otherParameters">The <see cref="DreamDaemonLaunchParameters"/> to compare against</param>
/// <returns><see langword="true"/> if they match, <see langword="false"/> otherwise</returns>
@@ -57,7 +57,6 @@ namespace Tgstation.Server.Api.Models.Internal
&& SecurityLevel == otherParameters.SecurityLevel
&& PrimaryPort == otherParameters.PrimaryPort
&& SecondaryPort == otherParameters.SecondaryPort
&& StartupTimeout == otherParameters.StartupTimeout
&& HeartbeatSeconds == otherParameters.HeartbeatSeconds;
&& HeartbeatSeconds == otherParameters.HeartbeatSeconds; // We intentionally don't check StartupTimeout as it doesn't matter
}
}