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

Always log at least error message when error happens during request processing

Browse Source
This commit is contained in:
Vasily 2019-10-09 14:00:22 +03:00
parent 33b69a7099
commit 8109c7eb30
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ namespace Emby.Server.Implementations.HttpServer
} }
} }
private async Task ErrorHandler(Exception ex, IRequest httpReq, bool logExceptionStackTrace, bool logExceptionMessage) private async Task ErrorHandler(Exception ex, IRequest httpReq, bool logExceptionStackTrace)
{ {
try try
{ {
@ -218,9 +218,9 @@ namespace Emby.Server.Implementations.HttpServer
{ {
_logger.LogError(ex, "Error processing request"); _logger.LogError(ex, "Error processing request");
} }
else if (logExceptionMessage) else
{ {
_logger.LogError(ex.Message); _logger.LogError("Error processing request: {0}", ex.Message);
} }
var httpRes = httpReq.Response; var httpRes = httpReq.Response;
@ -511,22 +511,22 @@ namespace Emby.Server.Implementations.HttpServer
} }
else else
{ {
await ErrorHandler(new FileNotFoundException(), httpReq, false, false).ConfigureAwait(false); await ErrorHandler(new FileNotFoundException(), httpReq, false).ConfigureAwait(false);
} }
} }
catch (Exception ex) when (ex is SocketException || ex is IOException || ex is OperationCanceledException) catch (Exception ex) when (ex is SocketException || ex is IOException || ex is OperationCanceledException)
{ {
await ErrorHandler(ex, httpReq, false, false).ConfigureAwait(false); await ErrorHandler(ex, httpReq, false).ConfigureAwait(false);
} }
catch (SecurityException ex) catch (SecurityException ex)
{ {
await ErrorHandler(ex, httpReq, false, true).ConfigureAwait(false); await ErrorHandler(ex, httpReq, false).ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
var logException = !string.Equals(ex.GetType().Name, "SocketException", StringComparison.OrdinalIgnoreCase); var logException = !string.Equals(ex.GetType().Name, "SocketException", StringComparison.OrdinalIgnoreCase);
await ErrorHandler(ex, httpReq, logException, false).ConfigureAwait(false); await ErrorHandler(ex, httpReq, logException).ConfigureAwait(false);
} }
finally finally
{ {