From f37a917f274f44b2cc9c924a69314cc454fbbb91 Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 30 Oct 2022 21:03:04 -0400
Subject: [PATCH 1/3] Fix an off semicolon

---
 src/Tgstation.Server.Host/Controllers/UserController.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs
index 87882947cb..78ed4839c7 100644
--- a/src/Tgstation.Server.Host/Controllers/UserController.cs
+++ b/src/Tgstation.Server.Host/Controllers/UserController.cs
@@ -110,8 +110,7 @@ namespace Tgstation.Server.Host.Controllers
 			var totalUsers = await DatabaseContext
 				.Users
 				.AsQueryable()
-				.CountAsync(cancellationToken)
-				;
+				.CountAsync(cancellationToken);
 			if (totalUsers >= generalConfiguration.UserLimit)
 				return Conflict(new ErrorMessageResponse(ErrorCode.UserLimitReached));
 

From 58711ecfbdb4e9f73e4758cba5219af85e3a07ee Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 30 Oct 2022 21:03:19 -0400
Subject: [PATCH 2/3] Version bump to 5.2.3

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index 2cab724f17..d5a53ab32a 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>5.2.2</TgsCoreVersion>
+    <TgsCoreVersion>5.2.3</TgsCoreVersion>
     <TgsConfigVersion>4.4.0</TgsConfigVersion>
     <TgsApiVersion>9.7.0</TgsApiVersion>
     <TgsApiLibraryVersion>10.1.0</TgsApiLibraryVersion>

From 49c70711d3b06ad9e72b798f963e7b647fa9fa47 Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 30 Oct 2022 21:07:44 -0400
Subject: [PATCH 3/3] Guard against deployment failures in Watchdog

Fixes #1413
---
 .../Components/Watchdog/WatchdogBase.cs            | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index 17c85b72b1..0d1adf433a 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -661,18 +661,26 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <param name="newCompileJob">The new <see cref="Models.CompileJob"/> being applied.</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
 		/// <returns>A <see cref="Task"/> representing the running operation.</returns>
-		protected Task BeforeApplyDmb(Models.CompileJob newCompileJob, CancellationToken cancellationToken)
+		protected async Task BeforeApplyDmb(Models.CompileJob newCompileJob, CancellationToken cancellationToken)
 		{
 			if (newCompileJob.Id == ActiveCompileJob?.Id)
 			{
 				Logger.LogTrace("Same compile job, not sending deployment event");
-				return Task.CompletedTask;
+				return;
 			}
 
 			var remoteDeploymentManager = remoteDeploymentManagerFactory.CreateRemoteDeploymentManager(
 				metadata,
 				newCompileJob);
-			return remoteDeploymentManager.ApplyDeployment(newCompileJob, ActiveCompileJob, cancellationToken);
+
+			try
+			{
+				await remoteDeploymentManager.ApplyDeployment(newCompileJob, ActiveCompileJob, cancellationToken);
+			}
+			catch (Exception ex)
+			{
+				Logger.LogWarning(ex, "Failed to apply remote deployment!");
+			}
 		}
 
 		/// <summary>