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

Addressing review feedback

Browse Source
This commit is contained in:
Vasily 2020-04-12 23:26:45 +03:00
parent 71d8e66d9f
commit 61d9c9df5b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,9 +242,7 @@ namespace Emby.Server.Implementations.HttpServer
private async Task ErrorHandler(Exception ex, IRequest httpReq, bool logExceptionStackTrace, string urlToLog) private async Task ErrorHandler(Exception ex, IRequest httpReq, bool logExceptionStackTrace, string urlToLog)
{ {
string urlSuffix = string.IsNullOrWhiteSpace(urlToLog) string urlSuffix = string.Format(CultureInfo.InvariantCulture, "; URL being processed: {0}", urlToLog);
? string.Format(CultureInfo.InvariantCulture, "; URL being processed: {0}", urlToLog)
: "";
try try
{ {
ex = GetActualException(ex); ex = GetActualException(ex);
@ -460,7 +458,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
@ -506,8 +504,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)