alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-21 01:26:41 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Use Microsoft.Extensions.Logging abstraction

Browse Source
This commit is contained in:
Bond_009
2018-12-13 14:18:25 +01:00
parent b0fd432126
commit 0f8b3c6347
310 changed files with 1421 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Mono/SocketSharp/SharpWebSocket.cs
View File

@@ -1,5 +1,5 @@
using MediaBrowser.Common.Events;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -55,7 +55,7 @@ namespace EmbyServer.SocketSharp
void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e)
{
_logger.Error("Error in SharpWebSocket: {0}", e.Message ?? string.Empty);
_logger.LogError("Error in SharpWebSocket: {0}", e.Message ?? string.Empty);
//EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
}

18
MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs
View File

@@ -1,5 +1,5 @@
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using SocketHttpListener.Net;
using System;
using System.Collections.Generic;
@@ -74,7 +74,7 @@ namespace EmbyServer.SocketSharp
foreach (var prefix in urlPrefixes)
{
_logger.Info("Adding HttpListener prefix " + prefix);
_logger.LogInformation("Adding HttpListener prefix " + prefix);
_listener.Prefixes.Add(prefix);
}
@@ -93,7 +93,7 @@ namespace EmbyServer.SocketSharp
{
var url = request.Url.ToString();
logger.Info("{0} {1}. UserAgent: {2}", request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod, url, request.UserAgent ?? string.Empty);
logger.LogInformation("{0} {1}. UserAgent: {2}", request.IsWebSocketRequest ? "WS" : "HTTP " + request.HttpMethod, url, request.UserAgent ?? string.Empty);
}
private Task InitTask(HttpListenerContext context, CancellationToken cancellationToken)
@@ -114,7 +114,7 @@ namespace EmbyServer.SocketSharp
}
catch (Exception ex)
{
_logger.ErrorException("Error processing request", ex);
_logger.LogError("Error processing request", ex);
httpReq = httpReq ?? GetRequest(context);
return ErrorHandler(ex, httpReq, true, true);
@@ -148,7 +148,7 @@ namespace EmbyServer.SocketSharp
if (connectingArgs.AllowConnection)
{
_logger.Debug("Web socket connection allowed");
_logger.LogDebug("Web socket connection allowed");
var webSocketContext = await ctx.AcceptWebSocketAsync(null).ConfigureAwait(false);
@@ -169,14 +169,14 @@ namespace EmbyServer.SocketSharp
}
else
{
_logger.Warn("Web socket connection not allowed");
_logger.LogWarning("Web socket connection not allowed");
ctx.Response.StatusCode = 401;
ctx.Response.Close();
}
}
catch (Exception ex)
{
_logger.ErrorException("AcceptWebSocketAsync error", ex);
_logger.LogError("AcceptWebSocketAsync error", ex);
ctx.Response.StatusCode = 500;
ctx.Response.Close();
}
@@ -206,7 +206,7 @@ namespace EmbyServer.SocketSharp
}
catch (Exception ex)
{
_logger.ErrorException("Error closing web socket response", ex);
_logger.LogError("Error closing web socket response", ex);
}
}
@@ -259,4 +259,4 @@ namespace EmbyServer.SocketSharp
}
}
}
}

2
MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpRequest.cs
View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Text;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Services;
using SocketHttpListener.Net;
using IHttpFile = MediaBrowser.Model.Services.IHttpFile;

4
MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpResponse.cs
View File

@@ -6,7 +6,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Services;
using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse;
using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
@@ -112,7 +112,7 @@ namespace EmbyServer.SocketSharp
}
catch (Exception ex)
{
_logger.ErrorException("Error in HttpListenerResponseWrapper: " + ex.Message, ex);
_logger.LogError("Error in HttpListenerResponseWrapper: " + ex.Message, ex);
}
}
}