From 192e62e4821ec982df26c30f44946b3ef82c4c97 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 7 Feb 2025 18:50:30 -0500 Subject: [PATCH] Fix deleting the propagated exception file before reading it Fixes #2101 --- .../Watchdog.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Tgstation.Server.Host.Watchdog/Watchdog.cs b/src/Tgstation.Server.Host.Watchdog/Watchdog.cs index 09a985c9dd..706c418d94 100644 --- a/src/Tgstation.Server.Host.Watchdog/Watchdog.cs +++ b/src/Tgstation.Server.Host.Watchdog/Watchdog.cs @@ -258,6 +258,7 @@ namespace Tgstation.Server.Host.Watchdog process.StartInfo.UseShellExecute = false; // runs in the same console var killedHostProcess = false; + var createdShutdownFile = false; try { Task? processTask = null; @@ -279,6 +280,7 @@ namespace Tgstation.Server.Host.Watchdog { logger.LogInformation("Cancellation requested! Writing shutdown lock file..."); File.WriteAllBytes(updateDirectory, Array.Empty()); + createdShutdownFile = true; } else logger.LogWarning("Cancellation requested while update directory exists!"); @@ -330,15 +332,16 @@ namespace Tgstation.Server.Host.Watchdog logger.LogWarning(ex2, "Error killing host process!"); } - try - { - if (File.Exists(updateDirectory)) - File.Delete(updateDirectory); - } - catch (Exception ex2) - { - logger.LogWarning(ex2, "Error deleting comms file!"); - } + if (createdShutdownFile) + try + { + if (File.Exists(updateDirectory)) + File.Delete(updateDirectory); + } + catch (Exception ex2) + { + logger.LogWarning(ex2, "Error deleting comms file!"); + } logger.LogInformation("Host exited!"); }