Workaround for dotnet/efcore#15074

tgstation · Jul 4, 2020 · 64952bc · 64952bc
1 parent 09c763b
commit 64952bc
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs b/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs
@@ -40,6 +40,12 @@ public static void UseDbConflictHandling(this IApplicationBuilder applicationBui
 				}
 				catch (DbUpdateException e)
 				{
+					if (e.InnerException is OperationCanceledException)
+					{
+						logger.LogTrace("Rethrowing DbUpdateException as OperationCanceledException: {0}", e);
+						throw e.InnerException;
+					}
+
 					logger.LogDebug("Database conflict: {0}", e.Message);
 					await new ConflictObjectResult(new ErrorMessage(ErrorCode.DatabaseIntegrityConflict)
 					{