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 @@
- 5.2.2
+ 5.2.3
4.4.0
9.7.0
10.1.0
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
/// The new being applied.
/// The for the operation.
/// A representing the running operation.
- 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!");
+ }
}
///
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));