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

I am once again asking you to fix process output reading

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-17 09:16:35 -05:00
parent a9d21eccf7
commit 2cff33c5b3
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/System/ProcessExecutor.cs
+43 -39
View File
@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Text;
using System.Threading;
@@ -7,7 +8,6 @@ using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Tgstation.Server.Common.Extensions;
using Tgstation.Server.Host.IO;
namespace Tgstation.Server.Host.System
@@ -145,9 +145,6 @@ namespace Tgstation.Server.Host.System
if (readStandardHandles)
{
processStartTcs = new TaskCompletionSource<int>();
handle.StartInfo.RedirectStandardOutput = true;
handle.StartInfo.RedirectStandardError = true;
disposeCts = new CancellationTokenSource();
readTask = ConsumeReaders(handle, processStartTcs.Task, fileRedirect, disposeCts.Token);
}
@@ -228,11 +225,8 @@ namespace Tgstation.Server.Host.System
/// <returns>A <see cref="Task{TResult}"/> resulting in the program's output/error text if <paramref name="fileRedirect"/> is <see langword="null"/>, <see langword="null"/> otherwise.</returns>
async Task<string> ConsumeReaders(global::System.Diagnostics.Process handle, Task<int> startupAndPid, string fileRedirect, CancellationToken cancellationToken)
{
var pid = await startupAndPid;
logger.LogTrace("Starting read for PID {pid}...", pid);
var stdOutHandle = handle.StandardOutput;
var stdErrHandle = handle.StandardError;
handle.StartInfo.RedirectStandardOutput = true;
handle.StartInfo.RedirectStandardError = true;
bool writingToFile;
await using var fileStream = (writingToFile = fileRedirect != null) ? ioManager.CreateAsyncSequentialWriteStream(fileRedirect) : null;
@@ -249,24 +243,31 @@ namespace Tgstation.Server.Host.System
});
var handlesOpen = 2;
async ValueTask DrainHandle(StreamReader reader)
async void DataReceivedHandler(object sender, DataReceivedEventArgs eventArgs)
{
while (true)
var line = eventArgs.Data;
if (line == null)
{
var line = await reader.ReadLineAsync(cancellationToken);
if (line == null)
{
var handlesRemaining = Interlocked.Decrement(ref handlesOpen);
if (handlesRemaining == 0)
dataChannel.Writer.Complete();
var handlesRemaining = Interlocked.Decrement(ref handlesOpen);
if (handlesRemaining == 0)
dataChannel.Writer.Complete();
break;
}
return;
}
try
{
await dataChannel.Writer.WriteAsync(line, cancellationToken);
}
catch (OperationCanceledException ex)
{
logger.LogWarning(ex, "Handle channel write interrupted!");
}
}
handle.OutputDataReceived += DataReceivedHandler;
handle.ErrorDataReceived += DataReceivedHandler;
async ValueTask OutputWriter()
{
var enumerable = dataChannel.Reader.ReadAllAsync(cancellationToken);
@@ -289,28 +290,31 @@ namespace Tgstation.Server.Host.System
stringBuilder.AppendLine(text);
}
try
{
var outputWriterTask = OutputWriter();
try
{
var outputReadTask = DrainHandle(stdOutHandle);
var errorReadTask = DrainHandle(stdErrHandle);
var pid = await startupAndPid;
logger.LogTrace("Starting read for PID {pid}...", pid);
await ValueTaskExtensions.WhenAll(outputReadTask, errorReadTask);
}
finally
{
await outputWriterTask;
}
logger.LogTrace("Finished read for PID {pid}", pid);
}
catch (OperationCanceledException ex)
using (cancellationToken.Register(() => dataChannel.Writer.TryComplete()))
{
logger.LogWarning(ex, "PID {pid} stream reading interrupted!", pid);
if (fileStream != null)
await writer.WriteLineAsync("-- Process detached, log truncated. This is likely due a to TGS restart --");
handle.BeginOutputReadLine();
using (cancellationToken.Register(handle.CancelOutputRead))
{
handle.BeginErrorReadLine();
using (cancellationToken.Register(handle.CancelErrorRead))
{
try
{
await OutputWriter();
logger.LogTrace("Finished read for PID {pid}", pid);
}
catch (OperationCanceledException ex)
{
logger.LogWarning(ex, "PID {pid} stream reading interrupted!", pid);
if (fileStream != null)
await writer.WriteLineAsync("-- Process detached, log truncated. This is likely due a to TGS restart --");
}
}
}
}
return stringBuilder?.ToString();