Merge pull request #285 from Bond-009/logging

Use Serilog to handle logging

4 files changed, 14 insertions, 14 deletions

diff --git a/MediaBrowser.Server.Mono/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Mono/SocketSharp/SharpWebSocket.cs
index 6c2dd0f76..fd32640a2 100644
--- a/MediaBrowser.Server.Mono/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Mono/SocketSharp/SharpWebSocket.cs
@@ -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);
         }
 
diff --git a/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs
index e75a38e38..993863e8c 100644
--- a/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs
@@ -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(ex, "Error processing request");
 
                 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(ex, "AcceptWebSocketAsync error");
                 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(ex, "Error closing web socket response");
             }
         }
 
@@ -259,4 +259,4 @@ namespace EmbyServer.SocketSharp
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpRequest.cs b/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpRequest.cs
index 84e37a58c..1e1c3db7c 100644
--- a/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpRequest.cs
+++ b/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpRequest.cs
@@ -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;
diff --git a/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpResponse.cs b/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpResponse.cs
index 15ff6675d..08fa4cbd6 100644
--- a/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpResponse.cs
+++ b/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpResponse.cs
@@ -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(ex, "Error in HttpListenerResponseWrapper");
                 }
             }
         }