Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

update request logging

Browse Source
This commit is contained in:
Luke Pulverenti 2017-07-22 18:58:03 -04:00
parent f0507b644d
commit b41614ac81
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,7 @@ namespace Emby.Server.Implementations.HttpServer
readonly Dictionary<Type, int> _mapExceptionToStatusCode = new Dictionary<Type, int> readonly Dictionary<Type, int> _mapExceptionToStatusCode = new Dictionary<Type, int>
{ {
{typeof (ResourceNotFoundException), 404}, {typeof (ResourceNotFoundException), 404},
{typeof (RemoteServiceUnavailableException), 502},
{typeof (FileNotFoundException), 404}, {typeof (FileNotFoundException), 404},
//{typeof (DirectoryNotFoundException), 404}, //{typeof (DirectoryNotFoundException), 404},
{typeof (SecurityException), 401}, {typeof (SecurityException), 401},
@ -268,6 +269,29 @@ namespace Emby.Server.Implementations.HttpServer
} }
} }
private Exception GetActualException(Exception ex)
{
var agg = ex as AggregateException;
if (agg != null)
{
var inner = agg.InnerException;
if (inner != null)
{
return GetActualException(inner);
}
else
{
var inners = agg.InnerExceptions;
if (inners != null && inners.Count > 0)
{
return GetActualException(inners[0]);
}
}
}
return ex;
}
private int GetStatusCode(Exception ex) private int GetStatusCode(Exception ex)
{ {
if (ex is ArgumentException) if (ex is ArgumentException)
@ -280,7 +304,7 @@ namespace Emby.Server.Implementations.HttpServer
int statusCode; int statusCode;
if (!_mapExceptionToStatusCode.TryGetValue(exceptionType, out statusCode)) if (!_mapExceptionToStatusCode.TryGetValue(exceptionType, out statusCode))
{ {
if (string.Equals(exceptionType.Name, "DirectoryNotFoundException", StringComparison.OrdinalIgnoreCase)) if (ex is DirectoryNotFoundException)
{ {
statusCode = 404; statusCode = 404;
} }
@ -297,6 +321,8 @@ namespace Emby.Server.Implementations.HttpServer
{ {
try try
{ {
ex = GetActualException(ex);
if (logException) if (logException)
{ {
_logger.ErrorException("Error processing request", ex); _logger.ErrorException("Error processing request", ex);