mirror of https://github.com/jellyfin/jellyfin.git
fix: read configuration during Invoke instead of during construction
This commit is contained in:
parent
8b69b0f521
commit
ac760b9c86
|
@ -19,53 +19,35 @@ namespace Jellyfin.Server.Middleware
|
||||||
private readonly RequestDelegate _next;
|
private readonly RequestDelegate _next;
|
||||||
private readonly ILogger<ResponseTimeMiddleware> _logger;
|
private readonly ILogger<ResponseTimeMiddleware> _logger;
|
||||||
|
|
||||||
private readonly bool _enableWarning;
|
|
||||||
private readonly long _warningThreshold;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="ResponseTimeMiddleware"/> class.
|
/// Initializes a new instance of the <see cref="ResponseTimeMiddleware"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="next">Next request delegate.</param>
|
/// <param name="next">Next request delegate.</param>
|
||||||
/// <param name="logger">Instance of the <see cref="ILogger{ExceptionMiddleware}"/> interface.</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(
|
public ResponseTimeMiddleware(
|
||||||
RequestDelegate next,
|
RequestDelegate next,
|
||||||
ILogger<ResponseTimeMiddleware> logger,
|
ILogger<ResponseTimeMiddleware> logger)
|
||||||
IServerConfigurationManager serverConfigurationManager)
|
|
||||||
{
|
{
|
||||||
_next = next;
|
_next = next;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
|
||||||
_enableWarning = serverConfigurationManager.Configuration.EnableSlowResponseWarning;
|
|
||||||
_warningThreshold = serverConfigurationManager.Configuration.SlowResponseThresholdMs;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Invoke request.
|
/// Invoke request.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="context">Request context.</param>
|
/// <param name="context">Request context.</param>
|
||||||
|
/// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
public async Task Invoke(HttpContext context)
|
public async Task Invoke(HttpContext context, IServerConfigurationManager serverConfigurationManager)
|
||||||
{
|
{
|
||||||
var watch = new Stopwatch();
|
var watch = new Stopwatch();
|
||||||
watch.Start();
|
watch.Start();
|
||||||
|
var enableWarning = serverConfigurationManager.Configuration.EnableSlowResponseWarning;
|
||||||
|
var warningThreshold = serverConfigurationManager.Configuration.SlowResponseThresholdMs;
|
||||||
context.Response.OnStarting(() =>
|
context.Response.OnStarting(() =>
|
||||||
{
|
{
|
||||||
watch.Stop();
|
watch.Stop();
|
||||||
LogWarning(context, watch);
|
if (enableWarning && watch.ElapsedMilliseconds > warningThreshold)
|
||||||
var responseTimeForCompleteRequest = watch.ElapsedMilliseconds;
|
|
||||||
context.Response.Headers[ResponseHeaderResponseTime] = responseTimeForCompleteRequest.ToString(CultureInfo.InvariantCulture);
|
|
||||||
return Task.CompletedTask;
|
|
||||||
});
|
|
||||||
|
|
||||||
// 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(
|
_logger.LogWarning(
|
||||||
"Slow HTTP Response from {Url} to {RemoteIp} in {Elapsed:g} with Status Code {StatusCode}",
|
"Slow HTTP Response from {Url} to {RemoteIp} in {Elapsed:g} with Status Code {StatusCode}",
|
||||||
|
@ -74,6 +56,14 @@ namespace Jellyfin.Server.Middleware
|
||||||
watch.Elapsed,
|
watch.Elapsed,
|
||||||
context.Response.StatusCode);
|
context.Response.StatusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var responseTimeForCompleteRequest = watch.ElapsedMilliseconds;
|
||||||
|
context.Response.Headers[ResponseHeaderResponseTime] = responseTimeForCompleteRequest.ToString(CultureInfo.InvariantCulture);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Call the next delegate/middleware in the pipeline
|
||||||
|
await this._next(context).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue