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

Nullify SessionControllerFactory

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-23 22:06:23 -05:00
parent 47ac4229ae
commit a47017d318
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Session/ISessionControllerFactory.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Tgstation.Server.Host.Components.Session
/// <param name="reattachInformation">The <see cref="ReattachInformation"/> to use.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in a new <see cref="ISessionController"/> on success or <see langword="null"/> on failure to reattach.</returns>
ValueTask<ISessionController> Reattach(
ValueTask<ISessionController?> Reattach(
ReattachInformation reattachInformation,
CancellationToken cancellationToken);
}
src/Tgstation.Server.Host/Components/Session/SessionControllerFactory.cs
+21 -21
View File
@@ -26,8 +26,6 @@ using Tgstation.Server.Host.Security;
using Tgstation.Server.Host.System;
using Tgstation.Server.Host.Utils;
#nullable disable
namespace Tgstation.Server.Host.Components.Session
{
/// <inheritdoc />
@@ -227,7 +225,7 @@ namespace Tgstation.Server.Host.Components.Session
#pragma warning disable CA1506 // TODO: Decomplexify
public async ValueTask<ISessionController> LaunchNew(
IDmbProvider dmbProvider,
IEngineExecutableLock currentByondLock,
IEngineExecutableLock? currentByondLock,
DreamDaemonLaunchParameters launchParameters,
bool apiValidate,
CancellationToken cancellationToken)
@@ -270,17 +268,17 @@ namespace Tgstation.Server.Host.Components.Session
dmbProvider.CompileJob.Id);
// mad this isn't abstracted but whatever
var engineType = dmbProvider.EngineVersion.Engine.Value;
var engineType = dmbProvider.EngineVersion.Engine!.Value;
if (engineType == EngineType.Byond)
await CheckPagerIsNotRunning();
await PortBindTest(launchParameters.Port.Value, engineType, cancellationToken);
string outputFilePath = null;
string? outputFilePath = null;
var preserveLogFile = true;
var hasStandardOutput = engineLock.HasStandardOutput;
if (launchParameters.LogOutput.Value)
if (launchParameters.LogOutput!.Value)
{
var now = DateTimeOffset.UtcNow;
var dateDirectory = diagnosticsIOManager.ConcatPath(DreamDaemonLogsPath, now.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture));
@@ -322,8 +320,8 @@ namespace Tgstation.Server.Host.Components.Session
var runtimeInformation = CreateRuntimeInformation(
dmbProvider,
chatTrackingContext,
launchParameters.SecurityLevel.Value,
launchParameters.Visibility.Value,
launchParameters.SecurityLevel!.Value,
launchParameters.Visibility!.Value,
apiValidate);
var reattachInformation = new ReattachInformation(
@@ -335,7 +333,7 @@ namespace Tgstation.Server.Host.Components.Session
var byondTopicSender = topicClientFactory.CreateTopicClient(
TimeSpan.FromMilliseconds(
launchParameters.TopicRequestTimeout.Value));
launchParameters.TopicRequestTimeout!.Value));
var sessionController = new SessionController(
reattachInformation,
@@ -387,7 +385,7 @@ namespace Tgstation.Server.Host.Components.Session
#pragma warning restore CA1506
/// <inheritdoc />
public async ValueTask<ISessionController> Reattach(
public async ValueTask<ISessionController?> Reattach(
ReattachInformation reattachInformation,
CancellationToken cancellationToken)
{
@@ -452,19 +450,21 @@ namespace Tgstation.Server.Host.Components.Session
}
catch
{
chatTrackingContext.Dispose();
chatTrackingContext?.Dispose();
throw;
}
}
catch
{
await process.DisposeAsync();
if (process != null)
await process.DisposeAsync();
throw;
}
}
catch
{
engineLock.Dispose();
engineLock?.Dispose();
throw;
}
}
@@ -476,7 +476,7 @@ namespace Tgstation.Server.Host.Components.Session
/// <param name="engineLock">The <see cref="IEngineExecutableLock"/>.</param>
/// <param name="launchParameters">The <see cref="DreamDaemonLaunchParameters"/>.</param>
/// <param name="accessIdentifier">The secure string to use for the session.</param>
/// <param name="logFilePath">The full path to log DreamDaemon output to.</param>
/// <param name="logFilePath">The optional full path to log DreamDaemon output to.</param>
/// <param name="apiValidate">If we are only validating the DMAPI then exiting.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in the DreamDaemon <see cref="IProcess"/>.</returns>
@@ -485,7 +485,7 @@ namespace Tgstation.Server.Host.Components.Session
IEngineExecutableLock engineLock,
DreamDaemonLaunchParameters launchParameters,
string accessIdentifier,
string logFilePath,
string? logFilePath,
bool apiValidate,
CancellationToken cancellationToken)
{
@@ -557,19 +557,19 @@ namespace Tgstation.Server.Host.Components.Session
/// <param name="preserveFile">If <see langword="false"/>, <paramref name="outputFilePath"/> will be deleted.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask"/> representing the running operation.</returns>
async ValueTask LogDDOutput(IProcess process, string outputFilePath, bool cliSupported, bool preserveFile, CancellationToken cancellationToken)
async ValueTask LogDDOutput(IProcess process, string? outputFilePath, bool cliSupported, bool preserveFile, CancellationToken cancellationToken)
{
try
{
string ddOutput = null;
string? ddOutput = null;
if (cliSupported)
ddOutput = await process.GetCombinedOutput(cancellationToken);
ddOutput = (await process.GetCombinedOutput(cancellationToken))!;
if (ddOutput == null)
try
{
var dreamDaemonLogBytes = await gameIOManager.ReadAllBytes(
outputFilePath,
outputFilePath!,
cancellationToken);
ddOutput = Encoding.UTF8.GetString(dreamDaemonLogBytes);
@@ -580,7 +580,7 @@ namespace Tgstation.Server.Host.Components.Session
try
{
logger.LogTrace("Deleting temporary log file {path}...", outputFilePath);
await gameIOManager.DeleteFile(outputFilePath, cancellationToken);
await gameIOManager.DeleteFile(outputFilePath!, cancellationToken);
}
catch (Exception ex)
{
@@ -620,7 +620,7 @@ namespace Tgstation.Server.Host.Components.Session
chatTrackingContext,
dmbProvider,
assemblyInformationProvider.Version,
instance.Name,
instance.Name!,
securityLevel,
visibility,
serverPortProvider.HttpApiPort,