Add additional logging and skip processing invalid response

mythz · mythz · commit c17a62b4eeae · 2016-07-29T16:59:52.000-04:00
diff --git a/src/ServiceStack.Redis/RedisNativeClient.cs b/src/ServiceStack.Redis/RedisNativeClient.cs
@@ -1544,7 +1544,7 @@ public List<Dictionary<string, string>> SentinelMasters()
                 Commands.Masters,
             };
             var results = SendExpectDeeplyNestedMultiData(args.ToArray());
-            return (from object[] result in results select ToDictionary(result)).ToList();
+            return ToDictionaryList(results);
         }
 
         public Dictionary<string, string> SentinelMaster(string masterName)
@@ -1568,7 +1568,7 @@ public List<Dictionary<string, string>> SentinelSentinels(string masterName)
                 masterName.ToUtf8Bytes(),
             };
             var results = SendExpectDeeplyNestedMultiData(args.ToArray());
-            return (from object[] result in results select ToDictionary(result)).ToList();
+            return ToDictionaryList(results);
         }
 
         public List<Dictionary<string, string>> SentinelSlaves(string masterName)
@@ -1580,7 +1580,32 @@ public List<Dictionary<string, string>> SentinelSlaves(string masterName)
                 masterName.ToUtf8Bytes(),
             };
             var results = SendExpectDeeplyNestedMultiData(args.ToArray());
-            return (from object[] result in results select ToDictionary(result)).ToList();
+            return ToDictionaryList(results);
+        }
+
+        private static List<Dictionary<string, string>> ToDictionaryList(object[] results)
+        {
+            var to = new List<Dictionary<string, string>>();
+            foreach (object result in results)
+            {
+                var obArray = result as object[];
+                if (obArray == null)
+                {
+                    var value = result.ToString();
+                    var bytes = result as byte[];
+                    if (bytes != null)
+                        value = bytes.FromUtf8Bytes();
+
+                    log.ErrorFormat("Expected object[] received {0}: {1}", 
+                        result.GetType().Name, value);
+
+                    continue;
+                }
+
+                var item = ToDictionary(obArray);
+                to.Add(item);
+            }
+            return to;
         }
 
         public List<string> SentinelGetMasterAddrByName(string masterName)
