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

Merge pull request #2847 from mark-monteiro/fix-build

Browse Source 
Fix compilation error in HttpListenerHost
This commit is contained in:
Joshua M. Boniface 2020-04-12 21:35:43 -04:00 committed by GitHub
commit 4e9df69ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -517,28 +517,21 @@ namespace Emby.Server.Implementations.HttpServer
} }
else else
{ {
await ErrorHandler(new FileNotFoundException(), httpReq, false).ConfigureAwait(false); await ErrorHandler(new FileNotFoundException(), httpReq, false, urlToLog).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).ConfigureAwait(false); await ErrorHandler(ex, httpReq, false, urlToLog).ConfigureAwait(false);
} }
catch (SecurityException ex) catch (SecurityException ex)
{ {
await ErrorHandler(ex, httpReq, false).ConfigureAwait(false); await ErrorHandler(ex, httpReq, false, urlToLog).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, urlToLog).ConfigureAwait(false);
bool ignoreStackTrace =
ex is SocketException
|| ex is IOException
|| ex is OperationCanceledException
|| ex is SecurityException
|| ex is FileNotFoundException;
await ErrorHandler(ex, httpReq, !ignoreStackTrace, urlToLog).ConfigureAwait(false);
} }
finally finally
{ {