Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 13:44:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use static methods StopWatch where it makes sense (#8898)

Browse Source
This commit is contained in:
Bond-009 2022-12-14 22:03:26 +01:00 committed by GitHub
parent 3462676a8f
commit a455e580be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jellyfin.Server/Middleware/ResponseTimeMiddleware.cs
View File

@ -40,25 +40,25 @@ namespace Jellyfin.Server.Middleware
/// <returns>Task.</returns> /// <returns>Task.</returns>
public async Task Invoke(HttpContext context, IServerConfigurationManager serverConfigurationManager) public async Task Invoke(HttpContext context, IServerConfigurationManager serverConfigurationManager)
{ {
var watch = new Stopwatch(); var startTimestamp = Stopwatch.GetTimestamp();
watch.Start();
var enableWarning = serverConfigurationManager.Configuration.EnableSlowResponseWarning; var enableWarning = serverConfigurationManager.Configuration.EnableSlowResponseWarning;
var warningThreshold = serverConfigurationManager.Configuration.SlowResponseThresholdMs; var warningThreshold = serverConfigurationManager.Configuration.SlowResponseThresholdMs;
context.Response.OnStarting(() => context.Response.OnStarting(() =>
{ {
watch.Stop(); var responseTime = Stopwatch.GetElapsedTime(startTimestamp);
var responseTimeForCompleteRequest = watch.ElapsedMilliseconds; var responseTimeMs = responseTime.TotalMilliseconds;
if (enableWarning && responseTimeForCompleteRequest > warningThreshold && _logger.IsEnabled(LogLevel.Debug)) if (enableWarning && responseTimeMs > warningThreshold && _logger.IsEnabled(LogLevel.Debug))
{ {
_logger.LogDebug( _logger.LogDebug(
"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}",
context.Request.GetDisplayUrl(), context.Request.GetDisplayUrl(),
context.GetNormalizedRemoteIp(), context.GetNormalizedRemoteIp(),
watch.Elapsed, responseTime,
context.Response.StatusCode); context.Response.StatusCode);
} }
context.Response.Headers[ResponseHeaderResponseTime] = responseTimeForCompleteRequest.ToString(CultureInfo.InvariantCulture); context.Response.Headers[ResponseHeaderResponseTime] = responseTimeMs.ToString(CultureInfo.InvariantCulture);
return Task.CompletedTask; return Task.CompletedTask;
}); });

7
Jellyfin.Server/Program.cs
View File

@ -94,8 +94,7 @@ namespace Jellyfin.Server
private static async Task StartApp(StartupOptions options) private static async Task StartApp(StartupOptions options)
{ {
var stopWatch = new Stopwatch(); var startTimestamp = Stopwatch.GetTimestamp();
stopWatch.Start();
// Log all uncaught exceptions to std error // Log all uncaught exceptions to std error
static void UnhandledExceptionToConsole(object sender, UnhandledExceptionEventArgs e) => static void UnhandledExceptionToConsole(object sender, UnhandledExceptionEventArgs e) =>
@ -217,9 +216,7 @@ namespace Jellyfin.Server
await appHost.RunStartupTasksAsync(_tokenSource.Token).ConfigureAwait(false); await appHost.RunStartupTasksAsync(_tokenSource.Token).ConfigureAwait(false);
stopWatch.Stop(); _logger.LogInformation("Startup complete {Time:g}", Stopwatch.GetElapsedTime(startTimestamp));
_logger.LogInformation("Startup complete {Time:g}", stopWatch.Elapsed);
// Block main thread until shutdown // Block main thread until shutdown
await Task.Delay(-1, _tokenSource.Token).ConfigureAwait(false); await Task.Delay(-1, _tokenSource.Token).ConfigureAwait(false);