cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 08:00:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix IServerControl.Die() requiring a host watchdog

Browse Source
This commit is contained in:
Jordan Brown
2020-03-25 13:28:37 -04:00
parent 4fd9d9d228
commit 084e48f9f6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Server.cs
+5 -4
View File
@@ -202,7 +202,7 @@ namespace Tgstation.Server.Host
throw;
}
await Restart(version, null).ConfigureAwait(false);
await Restart(version, null, true).ConfigureAwait(false);
}
catch (OperationCanceledException)
{
@@ -247,15 +247,16 @@ namespace Tgstation.Server.Host
}
/// <inheritdoc />
public Task Restart() => Restart(null, null);
public Task Restart() => Restart(null, null, true);
/// <summary>
/// Implements <see cref="Restart()"/>
/// </summary>
/// <param name="newVersion">The <see cref="Version"/> of any potential updates being applied</param>
/// <param name="exception">The potential value of <see cref="propagatedException"/></param>
/// <param name="requireWatchdog">If the host watchdog is required for this "restart".</param>
/// <returns>A <see cref="Task"/> representing the running operation</returns>
async Task Restart(Version newVersion, Exception exception)
async Task Restart(Version newVersion, Exception exception, bool requireWatchdog)
{
CheckSanity(true);
@@ -300,6 +301,6 @@ namespace Tgstation.Server.Host
}
/// <inheritdoc />
public Task Die(Exception exception) => Restart(null, exception);
public Task Die(Exception exception) => Restart(null, exception, false);
}
}