mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-22 12:37:24 +01:00
One less async function
This commit is contained in:
@@ -424,21 +424,22 @@ namespace Tgstation.Server.Host.Components.Deployment
|
||||
/// <param name="job">The <see cref="CompileJob"/> to clean.</param>
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user