From 8f603302397fa1c83fdbdc148387153c47d9f4f2 Mon Sep 17 00:00:00 2001 From: Dominion Date: Sun, 28 May 2023 20:04:50 -0400 Subject: [PATCH] Fix rogue exceptions flying in CompileJob cleanup --- .../Components/Deployment/DmbFactory.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs index 1e01982bee..f57222c8b2 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs @@ -412,7 +412,20 @@ namespace Tgstation.Server.Host.Components.Deployment var deleteTask = DeleteCompileJobContent(job.DirectoryName.ToString(), cleanupCts.Token); var otherTask = cleanupTask; - await Task.WhenAll(otherTask, deleteTask, deploymentJob); + + async Task WrapThrowableTasks() + { + try + { + await Task.WhenAll(deleteTask, deploymentJob); + } + catch (Exception ex) + { + logger.LogWarning(ex, "Error cleaning up compile job {jobGuid}!", job.DirectoryName); + } + } + + await Task.WhenAll(otherTask, WrapThrowableTasks()); } lock (jobLockCounts)