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

Host.Watchdog forwards SIGUSR1 to child

Browse Source
This commit is contained in:
Jordan
2023-06-19 05:16:45 -04:00
parent 0dca581ef2
commit b0c002ddb0
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -11,7 +11,7 @@
<TgsClientVersion>12.0.0</TgsClientVersion>
<TgsDmapiVersion>6.5.0</TgsDmapiVersion>
<TgsInteropVersion>5.6.1</TgsInteropVersion>
<TgsHostWatchdogVersion>1.2.2</TgsHostWatchdogVersion>
<TgsHostWatchdogVersion>1.3.0</TgsHostWatchdogVersion>
<TgsContainerScriptVersion>1.2.1</TgsContainerScriptVersion>
<TgsMigratorVersion>1.0.1</TgsMigratorVersion>
</PropertyGroup>
src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj
+2
View File
@@ -24,6 +24,8 @@
<ItemGroup>
<!-- Usage: Logging abstractions -->
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<!-- Usage: POSIX support for signals -->
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<!-- Usage: Linting -->
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
src/Tgstation.Server.Host.Watchdog/Watchdog.cs
+36 -1
View File
@@ -11,6 +11,9 @@ using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Mono.Unix;
using Mono.Unix.Native;
using Tgstation.Server.Host.Common;
namespace Tgstation.Server.Host.Watchdog
@@ -148,6 +151,7 @@ namespace Tgstation.Server.Host.Watchdog
try
{
process.Start();
var childPid = process.Id;
using (var processCts = new CancellationTokenSource())
using (processCts.Token.Register(() => tcs.TrySetResult(null)))
@@ -173,7 +177,38 @@ namespace Tgstation.Server.Host.Watchdog
logger.LogWarning(ex, "Error triggering timeout!");
}
}))
await tcs.Task.ConfigureAwait(false);
{
var processTask = tcs.Task;
while (!processTask.IsCompleted)
{
using var unixSignal = isWindows
? null
: new UnixSignal(Signum.SIGUSR1);
var signalTcs = new TaskCompletionSource<object>();
if (!isWindows)
ThreadPool.RegisterWaitForSingleObject(
unixSignal,
(o, timeout) => signalTcs.SetResult(null),
null,
Timeout.Infinite,
true);
var signalTask = signalTcs.Task;
var completedTask = await Task.WhenAny(processTask, signalTask);
if (completedTask == signalTask)
{
logger.LogInformation("Received SIGUSR1, forwarding to main TGS process!");
var result = Syscall.kill(childPid, Signum.SIGUSR1);
if (result != 0)
logger.LogWarning(
new UnixIOException(Stdlib.GetLastError()),
"Failed to forward SIGUSR1!");
}
}
}
}
catch (InvalidOperationException ex)
{