Merge branch 'master' of ssh://github.com/ServiceStack/ServiceStack.Redis

Author: mythz

src/ServiceStack.Redis/Commands.cs

@@ -180,5 +180,8 @@ public static class Commands
         public readonly static byte[] Px = "PX".ToUtf8Bytes();
         public readonly static byte[] Nx = "NX".ToUtf8Bytes();
         public readonly static byte[] Xx = "XX".ToUtf8Bytes();
+
+        // Sentinel commands
+        public readonly static byte[] Sentinel = "SENTINEL".ToUtf8Bytes();
     }
 }

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -1209,6 +1209,24 @@ public byte[] BRPopLPush(string fromListId, string toListId, int timeOutSecs)
             return result.Length == 0 ? null : result[1];
         }
 
+        public object[] Sentinel(string command, string master = null)
+        {
+            if (command == null)
+                throw new ArgumentNullException("command");
+
+            var args = new List<byte[]>()
+            {
+                Commands.Sentinel,
+                command.ToUtf8Bytes()
+            };
+
+            if (master != null)
+            {
+                args.Add(master.ToUtf8Bytes());
+            }
+            return SendExpectDeeplyNestedMultiData(args.ToArray());
+        }
+
         #endregion
 
 

tests/ServiceStack.Redis.Tests/RedisSentinelTests.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+namespace ServiceStack.Redis.Tests
+{
+	[TestFixture, Category("Integration")]
+	public class RedisSentinelTests
+		: RedisClientTestsBase
+	{
+		protected RedisClient RedisSentinel;
+
+
+		public override void OnBeforeEachTest()
+		{
+			base.OnBeforeEachTest();
+
+			RedisSentinel = new RedisClient(TestConfig.SingleHost, TestConfig.RedisSentinelPort);
+		}
+
+
+		public override void TearDown()
+		{
+			base.TearDown();
+
+			RedisSentinel.Dispose();
+		}
+
+
+		[Test]
+		public void Can_Ping_Sentinel()
+		{
+			Assert.True(RedisSentinel.Ping());
+		}
+
+		[Test]
+		public void Can_Get_Sentinel_Masters()
+		{
+			object[] masters = RedisSentinel.Sentinel("masters");
+
+			Assert.AreEqual(masters.Count(), TestConfig.MasterHosts.Count());
+		}
+
+		[Test]
+		public void Can_Get_Sentinel_Slaves()
+		{
+			object[] slaves = RedisSentinel.Sentinel("slaves", TestConfig.MasterName);
+
+			Assert.AreEqual(slaves.Count(), TestConfig.SlaveHosts.Count());
+		}
+
+		[Test]
+		public void Can_Get_Master_Addr()
+		{
+			object[] addr = RedisSentinel.Sentinel("get-master-addr-by-name", TestConfig.MasterName);
+
+			string host = Encoding.UTF8.GetString((byte[])addr[0]);
+			string port = Encoding.UTF8.GetString((byte[])addr[1]);
+
+			Assert.AreEqual(host, "127.0.0.1");		// IP of localhost
+			Assert.AreEqual(port, TestConfig.RedisPort.ToString());
+		}
+	}
+}

tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj

@@ -232,6 +232,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RedisClientTestsBase.cs" />
     <Compile Include="RedisPubSubTests.cs" />
+    <Compile Include="RedisSentinelTests.cs" />
     <Compile Include="RedisTransactionCommonTests.cs" />
     <Compile Include="RedisTransactionTests.cs" />
     <Compile Include="RedisUtilTests.cs" />

tests/ServiceStack.Redis.Tests/TestConfig.cs

@@ -12,11 +12,13 @@ static TestConfig()
 
 		public const bool IgnoreLongTests = true;
 
-		public const string SingleHost = "localhost";
+        public const string SingleHost = "localhost";
+        public const string MasterName = "mymaster";
         public static readonly string[] MasterHosts = new[] { "localhost" };
         public static readonly string[] SlaveHosts = new[] { "localhost" };
 
 	    public const int RedisPort = 6379;
+	    public const int RedisSentinelPort = 26379;
 
 		public static string SingleHostConnectionString
 		{