From df3b010703f7b0dd9be46f41903b010abfb57d80 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 7 Sep 2013 11:59:18 -0400
Subject: improve failed provider logging message

---
 MediaBrowser.Server.Implementations/Providers/ProviderManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
index 59217bc17d..089b8a5055 100644
--- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
@@ -219,7 +219,7 @@ namespace MediaBrowser.Server.Implementations.Providers
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("{0} failed refreshing {1}", ex, provider.GetType().Name, item.Name);
+                _logger.ErrorException("{0} failed refreshing {1} {2}", ex, provider.GetType().Name, item.Name, item.Path ?? string.Empty);
 
                 provider.SetLastRefreshed(item, DateTime.UtcNow, ProviderRefreshStatus.Failure);
 
-- 
cgit v1.2.3


From 59f24493ce9b224ea9d7679f3048ed18252bc5cb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 7 Sep 2013 11:59:29 -0400
Subject: detect invalid json with web socket messages

---
 .../ServerManager/WebSocketConnection.cs                           | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 3612b85b95..4bab10ee09 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -132,10 +132,17 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         {
             LastActivityDate = DateTime.UtcNow;
 
+            if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
+            {
+                _logger.Error("Received web socket message that is not a json structure: " + message);
+                return;
+            }
+
             if (OnReceive == null)
             {
                 return;
             }
+
             try
             {
                 var stub = (WebSocketMessage<object>)_jsonSerializer.DeserializeFromString(message, typeof(WebSocketMessage<object>));
-- 
cgit v1.2.3