Merge pull request #7913 from cvium/fix_response_logging

Jellyfin.Server/Middleware/ResponseTimeMiddleware.cs

@@ -19,41 +19,44 @@ namespace Jellyfin.Server.Middleware
         private readonly RequestDelegate _next;
         private readonly ILogger<ResponseTimeMiddleware> _logger;
 
-        private readonly bool _enableWarning;
-        private readonly long _warningThreshold;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ResponseTimeMiddleware"/> class.
         /// </summary>
         /// <param name="next">Next request delegate.</param>
         /// <param name="logger">Instance of the <see cref="ILogger{ExceptionMiddleware}"/> interface.</param>
-        /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
         public ResponseTimeMiddleware(
             RequestDelegate next,
-            ILogger<ResponseTimeMiddleware> logger,
+            ILogger<ResponseTimeMiddleware> logger)
-            IServerConfigurationManager serverConfigurationManager)
         {
             _next = next;
             _logger = logger;
-
-            _enableWarning = serverConfigurationManager.Configuration.EnableSlowResponseWarning;
-            _warningThreshold = serverConfigurationManager.Configuration.SlowResponseThresholdMs;
         }
 
         /// <summary>
         /// Invoke request.
         /// </summary>
         /// <param name="context">Request context.</param>
+        /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
         /// <returns>Task.</returns>
-        public async Task Invoke(HttpContext context)
+        public async Task Invoke(HttpContext context, IServerConfigurationManager serverConfigurationManager)
         {
             var watch = new Stopwatch();
             watch.Start();
-
+            var enableWarning = serverConfigurationManager.Configuration.EnableSlowResponseWarning;
+            var warningThreshold = serverConfigurationManager.Configuration.SlowResponseThresholdMs;
             context.Response.OnStarting(() =>
             {
                 watch.Stop();
-                LogWarning(context, watch);
+                if (enableWarning && watch.ElapsedMilliseconds > warningThreshold)
+                {
+                    _logger.LogWarning(
+                        "Slow HTTP Response from {Url} to {RemoteIp} in {Elapsed:g} with Status Code {StatusCode}",
+                        context.Request.GetDisplayUrl(),
+                        context.GetNormalizedRemoteIp(),
+                        watch.Elapsed,
+                        context.Response.StatusCode);
+                }
+
                 var responseTimeForCompleteRequest = watch.ElapsedMilliseconds;
                 context.Response.Headers[ResponseHeaderResponseTime] = responseTimeForCompleteRequest.ToString(CultureInfo.InvariantCulture);
                 return Task.CompletedTask;
@@ -62,18 +65,5 @@ namespace Jellyfin.Server.Middleware
             // Call the next delegate/middleware in the pipeline
             await this._next(context).ConfigureAwait(false);
         }
-
-        private void LogWarning(HttpContext context, Stopwatch watch)
-        {
-            if (_enableWarning && watch.ElapsedMilliseconds > _warningThreshold)
-            {
-                _logger.LogWarning(
-                    "Slow HTTP Response from {Url} to {RemoteIp} in {Elapsed:g} with Status Code {StatusCode}",
-                    context.Request.GetDisplayUrl(),
-                    context.GetNormalizedRemoteIp(),
-                    watch.Elapsed,
-                    context.Response.StatusCode);
-            }
-        }
     }
 }