aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations
diff options
context:
space:
mode:
authorBond_009 <bond.009@outlook.com>2018-12-15 00:48:06 +0100
committerBond_009 <bond.009@outlook.com>2018-12-30 22:44:38 +0100
commit0c1b9d3bff7041b7d3b875885b8745680afcee72 (patch)
tree6d17181631e11518838e70146b300573722dadf1 /Emby.Server.Implementations
parenta8fde5e89c106c4601e0535218d8fe858c6a3908 (diff)
Rebase
Diffstat (limited to 'Emby.Server.Implementations')
-rw-r--r--Emby.Server.Implementations/HttpServer/WebSocketConnection.cs2
-rw-r--r--Emby.Server.Implementations/SystemEvents.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
index ca8723dde6..037bdde771 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -180,7 +180,7 @@ namespace Emby.Server.Implementations.HttpServer
if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
{
// This info is useful sometimes but also clogs up the log
- //_logger.Error("Received web socket message that is not a json structure: " + message);
+ //_lLogError("Received web socket message that is not a json structure: " + message);
return;
}
diff --git a/Emby.Server.Implementations/SystemEvents.cs b/Emby.Server.Implementations/SystemEvents.cs
index e529628332..f39d63002a 100644
--- a/Emby.Server.Implementations/SystemEvents.cs
+++ b/Emby.Server.Implementations/SystemEvents.cs
@@ -1,5 +1,4 @@
using System;
-using MediaBrowser.Common.Events;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.System;