Upgrade to newer redis client version

Fixed redis Count and server getter
MichaCo · Jan 20, 2016 · 1b22ddb · 1b22ddb
1 parent c8855ce
commit 1b22ddb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
-  "sdk": { "version": "1.0.0-rc1-update1" },
+  "sdk": {  },
   "projects": [
     "src",
     "test"

diff --git a/src/CacheManager.StackExchange.Redis/RedisCacheHandle.cs b/src/CacheManager.StackExchange.Redis/RedisCacheHandle.cs
@@ -54,14 +54,14 @@ public override int Count
         {
             get
             {
-                var server = this.GetServers(this.Connection).First(p => !p.IsSlave && p.IsConnected);
-                if (server == null)
+                var count = 0;
+                foreach(var server in this.GetServers().Where(p => !p.IsSlave && p.IsConnected))
                 {
-                    throw new InvalidOperationException("No active master found.");
+                    count += (int)server.DatabaseSize(this.RedisConfiguration.Database);
                 }
-
+                
                 // aprox size, only size on the master..
-                return (int)server.DatabaseSize(this.RedisConfiguration.Database);
+                return count;
             }
         }
 
@@ -104,10 +104,10 @@ private RedisConfiguration RedisConfiguration
         /// </summary>
         public override void Clear()
         {
-            foreach (var server in this.GetServers(this.Connection)
+            foreach (var server in this.GetServers()
                 .Where(p => !p.IsSlave))
             {
-                server.FlushDatabase(this.RedisConfiguration.Database);
+                this.Retry(() => server.FlushDatabase(this.RedisConfiguration.Database));
             }
         }
 
@@ -139,12 +139,14 @@ public override void ClearRegion(string region)
         /// </summary>
         /// <param name="muxer">The muxer.</param>
         /// <returns>The list of servers.</returns>
-        public IEnumerable<StackRedis.IServer> GetServers(StackRedis.ConnectionMultiplexer muxer)
+        public IEnumerable<StackRedis.IServer> GetServers()
         {
-            EndPoint[] endpoints = muxer.GetEndPoints();
+            var connection = this.Connection;
+
+            EndPoint[] endpoints = connection.GetEndPoints();
             foreach (var endpoint in endpoints)
             {
-                var server = muxer.GetServer(endpoint);
+                var server = connection.GetServer(endpoint);                
                 yield return server;
             }
         }

diff --git a/src/CacheManager.StackExchange.Redis/project.json b/src/CacheManager.StackExchange.Redis/project.json
@@ -1,4 +1,4 @@
-{
+{
   "version": "0.7.1-*",
   "description": "CacheManager is an open source abstraction layer for caching written in C#. It supports various cache providers and implements many advanced features. This package contains the specific cache handle for Redis.",
   "authors": [ "MichaConrad" ],
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "CacheManager.Core": "",
-    "StackExchange.Redis": "1.0.450"
+    "StackExchange.Redis": "1.0.488"
   },
   "frameworks": {
     "net40": {

diff --git a/test/CacheManager.Config.Tests/Properties/launchSettings.json b/test/CacheManager.Config.Tests/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "run": {
       "commandName": "run",
-      "sdkVersion": "dnx-coreclr-win-x86.1.0.0-rc1-update1"
+      "sdkVersion": "dnx-clr-win-x86.1.0.0-rc2-16384"
     }
   }
 }
diff --git a/test/CacheManager.Tests/project.json b/test/CacheManager.Tests/project.json
@@ -8,7 +8,7 @@
     "CacheManager.Web": "",
     "FluentAssertions": "4.1.0",
     "Moq": "4.2.1510.2205",
-    "xunit.runner.aspnet": "2.0.0-aspnet-rc1-*"
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "frameworks": {
     "dnx451": {

diff --git a/tools/redis/master.conf b/tools/redis/master.conf
@@ -1,4 +1,4 @@
 port 6379
 dbfilename master.rdb
 databases 2000
-maxmemory 250mb
+maxmemory 2500mb