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

Nullify BaseRemoteDeploymentManager

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-21 15:09:04 -05:00
parent 9beb48436b
commit 4d9be5bdd6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Deployment/Remote/BaseRemoteDeploymentManager.cs
+7 -8
View File
@@ -11,8 +11,6 @@ using Tgstation.Server.Common.Extensions;
using Tgstation.Server.Host.Components.Repository;
using Tgstation.Server.Host.Models;
#nullable disable
namespace Tgstation.Server.Host.Components.Deployment.Remote
{
/// <summary>
@@ -65,7 +63,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
var deployedRevisionInformation = compileJob.RevisionInformation;
if ((previousRevisionInformation != null && previousRevisionInformation.CommitSha == deployedRevisionInformation.CommitSha)
|| !repositorySettings.PostTestMergeComment.Value)
|| !repositorySettings.PostTestMergeComment!.Value)
return;
previousRevisionInformation ??= new RevisionInformation();
@@ -163,7 +161,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
{
ArgumentNullException.ThrowIfNull(compileJob);
if (activationCallbacks.TryGetValue(compileJob.Id.Value, out var activationCallback))
if (activationCallbacks.TryGetValue(compileJob.Require(x => x.Id), out var activationCallback))
activationCallback(true);
return ApplyDeploymentImpl(compileJob, cancellationToken);
@@ -177,7 +175,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
{
ArgumentNullException.ThrowIfNull(compileJob);
if (activationCallbacks.TryRemove(compileJob.Id.Value, out var activationCallback))
if (activationCallbacks.TryRemove(compileJob.Require(x => x.Id), out var activationCallback))
activationCallback(false);
return MarkInactiveImpl(compileJob, cancellationToken);
@@ -191,12 +189,13 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
CancellationToken cancellationToken);
/// <inheritdoc />
public ValueTask StageDeployment(CompileJob compileJob, Action<bool> activationCallback, CancellationToken cancellationToken)
public ValueTask StageDeployment(CompileJob compileJob, Action<bool>? activationCallback, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(compileJob);
if (activationCallback != null && !activationCallbacks.TryAdd(compileJob.Id.Value, activationCallback))
Logger.LogError("activationCallbacks conflicted on CompileJob #{id}!", compileJob.Id.Value);
var compileJobId = compileJob.Require(x => x.Id);
if (activationCallback != null && !activationCallbacks.TryAdd(compileJobId, activationCallback))
Logger.LogError("activationCallbacks conflicted on CompileJob #{id}!", compileJobId);
return StageDeploymentImpl(compileJob, cancellationToken);
}