aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2018-12-30 17:29:02 -0500
committerGitHub <noreply@github.com>2018-12-30 17:29:02 -0500
commit1f02cf4b7e13c932bc30968cbb74b71885fd3eb7 (patch)
tree2fbf2e570340765abd40b5ad8e491f1f212699c0 /MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs
parent7ad023143062c1995178e5700961b553822bd5af (diff)
parent4c95aee52eda793d1e013164cc0fde9eb609f894 (diff)
Merge pull request #285 from Bond-009/logging
Use Serilog to handle logging
Diffstat (limited to 'MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs')
-rw-r--r--MediaBrowser.Server.Mono/SocketSharp/WebSocketSharpListener.cs18
1 files changed, 9 insertions, 9 deletions
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
+}