michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2783 from JustAMan/better-cancel-msg

Browse Source 
Add logging of URL being processed when logging an error
This commit is contained in:
Joshua M. Boniface 2020-04-12 18:07:30 -04:00 committed by GitHub
commit 2be6550db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -239,7 +239,7 @@ namespace Emby.Server.Implementations.HttpServer
} }
} }
private async Task ErrorHandler(Exception ex, IRequest httpReq, bool logExceptionStackTrace) private async Task ErrorHandler(Exception ex, IRequest httpReq, bool logExceptionStackTrace, string urlToLog)
{ {
try try
{ {
@ -247,11 +247,11 @@ namespace Emby.Server.Implementations.HttpServer
if (logExceptionStackTrace) if (logExceptionStackTrace)
{ {
_logger.LogError(ex, "Error processing request"); _logger.LogError(ex, "Error processing request. URL: {Url}", urlToLog);
} }
else else
{ {
_logger.LogError("Error processing request: {Message}", ex.Message); _logger.LogError("Error processing request: {Message}. URL: {Url}", ex.Message.TrimEnd('.'), urlToLog);
} }
var httpRes = httpReq.Response; var httpRes = httpReq.Response;
@ -271,7 +271,7 @@ namespace Emby.Server.Implementations.HttpServer
} }
catch (Exception errorEx) catch (Exception errorEx)
{ {
_logger.LogError(errorEx, "Error this.ProcessRequest(context)(Exception while writing error to the response)"); _logger.LogError(errorEx, "Error this.ProcessRequest(context)(Exception while writing error to the response). URL: {Url}", urlToLog);
} }
} }
@ -456,7 +456,7 @@ namespace Emby.Server.Implementations.HttpServer
var stopWatch = new Stopwatch(); var stopWatch = new Stopwatch();
stopWatch.Start(); stopWatch.Start();
var httpRes = httpReq.Response; var httpRes = httpReq.Response;
string urlToLog = null; string urlToLog = GetUrlToLog(urlString);
string remoteIp = httpReq.RemoteIp; string remoteIp = httpReq.RemoteIp;
try try
@ -502,8 +502,6 @@ namespace Emby.Server.Implementations.HttpServer
return; return;
} }
urlToLog = GetUrlToLog(urlString);
if (string.Equals(localPath, _baseUrlPrefix + "/", StringComparison.OrdinalIgnoreCase) if (string.Equals(localPath, _baseUrlPrefix + "/", StringComparison.OrdinalIgnoreCase)
|| string.Equals(localPath, _baseUrlPrefix, StringComparison.OrdinalIgnoreCase) || string.Equals(localPath, _baseUrlPrefix, StringComparison.OrdinalIgnoreCase)
|| string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase) || string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase)
@ -553,7 +551,7 @@ namespace Emby.Server.Implementations.HttpServer
|| ex is OperationCanceledException || ex is OperationCanceledException
|| ex is SecurityException || ex is SecurityException
|| ex is FileNotFoundException; || ex is FileNotFoundException;
await ErrorHandler(ex, httpReq, ignoreStackTrace).ConfigureAwait(false); await ErrorHandler(ex, httpReq, !ignoreStackTrace, urlToLog).ConfigureAwait(false);
} }
finally finally
{ {