Clean up HTTP listener exception handling

This commit is contained in:
Mark Monteiro 2020-03-21 21:03:48 +01:00
parent aa546dd36a
commit 92628c4033

View File

@ -527,22 +527,18 @@ namespace Emby.Server.Implementations.HttpServer
} }
else else
{ {
await ErrorHandler(new FileNotFoundException(), httpReq, false).ConfigureAwait(false); throw new FileNotFoundException();
} }
} }
catch (Exception ex) when (ex is SocketException || ex is IOException || ex is OperationCanceledException)
{
await ErrorHandler(ex, httpReq, false).ConfigureAwait(false);
}
catch (SecurityException ex)
{
await ErrorHandler(ex, httpReq, false).ConfigureAwait(false);
}
catch (Exception ex) catch (Exception ex)
{ {
var logException = !string.Equals(ex.GetType().Name, "SocketException", StringComparison.OrdinalIgnoreCase); bool ignoreStackTrace =
ex is SocketException ||
await ErrorHandler(ex, httpReq, logException).ConfigureAwait(false); ex is IOException ||
ex is OperationCanceledException ||
ex is SecurityException ||
ex is FileNotFoundException;
await ErrorHandler(ex, httpReq, ignoreStackTrace).ConfigureAwait(false);
} }
finally finally
{ {