From 6f06f1e45cd95a51399a850b3bc5da74ba78a29b Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Thu, 15 Feb 2024 17:24:36 -0500 Subject: [PATCH] One less async function --- .../Components/Deployment/DmbFactory.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs index 3b6695313b..d61b2ffc68 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs @@ -424,21 +424,22 @@ namespace Tgstation.Server.Host.Components.Deployment /// The to clean. void CleanRegisteredCompileJob(CompileJob job) { - async Task HandleCleanup() + Task HandleCleanup() { - // First kill the GitHub deployment - var remoteDeploymentManager = remoteDeploymentManagerFactory.CreateRemoteDeploymentManager(metadata, job); - - // DCT: None available - var deploymentJob = remoteDeploymentManager.MarkInactive(job, CancellationToken.None); - - var deleteTask = DeleteCompileJobContent(job.DirectoryName!.Value.ToString(), cleanupCts.Token); var otherTask = cleanupTask; async Task WrapThrowableTasks() { try { + // First kill the GitHub deployment + var remoteDeploymentManager = remoteDeploymentManagerFactory.CreateRemoteDeploymentManager(metadata, job); + + // DCT: None available + var deploymentJob = remoteDeploymentManager.MarkInactive(job, CancellationToken.None); + + var deleteTask = DeleteCompileJobContent(job.DirectoryName!.Value.ToString(), cleanupCts.Token); + await ValueTaskExtensions.WhenAll(deleteTask, deploymentJob); } catch (Exception ex) @@ -447,7 +448,7 @@ namespace Tgstation.Server.Host.Components.Deployment } } - await Task.WhenAll(otherTask, WrapThrowableTasks()); + return Task.WhenAll(otherTask, WrapThrowableTasks()); } lock (jobLockCounts)