aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Net
diff options
context:
space:
mode:
authorLogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>2019-01-01 11:47:57 -0800
committerGitHub <noreply@github.com>2019-01-01 11:47:57 -0800
commit443218e3f109cdfbffa8c8c5d30e09e3ba5c2285 (patch)
tree6de8dee799eebba514bac0b6eac457b4c0137978 /MediaBrowser.Controller/Net
parent0c52f448a0c6d5cd3c5cce597fcf3ad9582c90f1 (diff)
parentcff0ece07329bbfa05fd22fbde444d09aaeb9a5c (diff)
Merge pull request #4 from jellyfin/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Net')
-rw-r--r--MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 7df96b7776..31ec149bf9 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Net;
using MediaBrowser.Model.Threading;
using System.Collections.Generic;
using System.Globalization;
@@ -8,6 +7,7 @@ using System.Net.WebSockets;
using System.Threading.Tasks;
using System.Threading;
using System;
+using Microsoft.Extensions.Logging;
namespace MediaBrowser.Controller.Net
{
@@ -114,7 +114,7 @@ namespace MediaBrowser.Controller.Net
var cancellationTokenSource = new CancellationTokenSource();
- Logger.Debug("{1} Begin transmitting over websocket to {0}", message.Connection.RemoteEndPoint, GetType().Name);
+ Logger.LogDebug("{1} Begin transmitting over websocket to {0}", message.Connection.RemoteEndPoint, GetType().Name);
var timer = SendOnTimer ?
TimerFactory.Create(TimerCallback, message.Connection, Timeout.Infinite, Timeout.Infinite) :
@@ -229,7 +229,7 @@ namespace MediaBrowser.Controller.Net
}
catch (Exception ex)
{
- Logger.ErrorException("Error sending web socket message {0}", ex, Name);
+ Logger.LogError(ex, "Error sending web socket message {Name}", Name);
DisposeConnection(tuple);
}
}
@@ -257,7 +257,7 @@ namespace MediaBrowser.Controller.Net
/// <param name="connection">The connection.</param>
private void DisposeConnection(Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType> connection)
{
- Logger.Debug("{1} stop transmitting over websocket to {0}", connection.Item1.RemoteEndPoint, GetType().Name);
+ Logger.LogDebug("{1} stop transmitting over websocket to {0}", connection.Item1.RemoteEndPoint, GetType().Name);
var timer = connection.Item3;