Workaround for dotnet/efcore#15074

Cyberboss · Cyberboss · commit 64952bc2684f · 2020-07-04T13:22:28.000-04:00
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)
 					{

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ public static void UseDbConflictHandling(this IApplicationBuilder applicationBui`
`40`	`40`	`}`
`41`	`41`	`catch (DbUpdateException e)`
`42`	`42`	`{`
	`43`	`+ if (e.InnerException is OperationCanceledException)`
	`44`	`+ {`
	`45`	`+ logger.LogTrace("Rethrowing DbUpdateException as OperationCanceledException: {0}", e);`
	`46`	`+ throw e.InnerException;`
	`47`	`+ }`
	`48`	`+`
`43`	`49`	`logger.LogDebug("Database conflict: {0}", e.Message);`
`44`	`50`	`await new ConflictObjectResult(new ErrorMessage(ErrorCode.DatabaseIntegrityConflict)`
`45`	`51`	`{`