From 708b5c21e4d44ddfb5faf9fd0152e649cfe271e6 Mon Sep 17 00:00:00 2001 From: Dominion Date: Sun, 23 Apr 2023 10:27:14 -0400 Subject: [PATCH] Fix cancelled requests being logged as errors during startup Also cleanup ApplicationBuilderExtensions.cs --- src/Tgstation.Server.Host/Core/Application.cs | 9 +++------ .../Extensions/ApplicationBuilderExtensions.cs | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs index eb88be12f7..d502e30046 100644 --- a/src/Tgstation.Server.Host/Core/Application.cs +++ b/src/Tgstation.Server.Host/Core/Application.cs @@ -437,15 +437,12 @@ namespace Tgstation.Server.Host.Core // Add the X-Powered-By response header applicationBuilder.UseServerBranding(assemblyInformationProvider); - // 503 requests made while the application is starting - applicationBuilder.UseAsyncInitialization(async (cancellationToken) => - { - await instanceManager.Ready.WithToken(cancellationToken); - }); - // suppress OperationCancelledExceptions, they are just aborted HTTP requests applicationBuilder.UseCancelledRequestSuppression(); + // 503 requests made while the application is starting + applicationBuilder.UseAsyncInitialization(instanceManager.Ready.WithToken); + if (generalConfiguration.HostApiDocumentation) { applicationBuilder.UseSwagger(); diff --git a/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs b/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs index ca1369dc46..22872c346e 100644 --- a/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs +++ b/src/Tgstation.Server.Host/Extensions/ApplicationBuilderExtensions.cs @@ -103,6 +103,7 @@ namespace Tgstation.Server.Host.Extensions { if (applicationBuilder == null) throw new ArgumentNullException(nameof(applicationBuilder)); + applicationBuilder.Use(async (context, next) => { var logger = GetLogger(context); @@ -124,8 +125,7 @@ namespace Tgstation.Server.Host.Extensions .ExecuteResultAsync(new ActionContext { HttpContext = context, - }) - ; + }); } }); }