Updated packages and bugfixing on connection pool

imperugo · Apr 9, 2020 · dddd40b · dddd40b
1 parent 9c5a2bf
commit dddd40b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 23 deletions.
diff --git a/samples/StackExchange.Redis.Samples.Web.Mvc/Controllers/HomeController.cs b/samples/StackExchange.Redis.Samples.Web.Mvc/Controllers/HomeController.cs
@@ -12,30 +12,23 @@ namespace StackExchange.Redis.Samples.Web.Mvc.Controllers
 {
     public class HomeController : Controller
     {
-        private readonly ILogger<HomeController> _logger;
+        private readonly ILogger<HomeController> logger;
         private readonly IRedisDatabase redisDatabase;
+        private readonly IRedisCacheConnectionPoolManager connectionPoolManager;
 
-        public HomeController(ILogger<HomeController> logger, IRedisDatabase redisDatabase)
+        public HomeController(ILogger<HomeController> logger, IRedisDatabase redisDatabase, IRedisCacheConnectionPoolManager connectionPoolManager)
         {
-            _logger = logger;
+            this.logger = logger;
             this.redisDatabase = redisDatabase;
+            this.connectionPoolManager = connectionPoolManager;
         }
 
+
         public async Task<IActionResult> Index()
         {
             var redisInfo = await redisDatabase.GetInfoAsync();
-            return Ok(redisInfo);
-        }
-
-        public IActionResult Privacy()
-        {
-            return View();
-        }
-
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+            var connectionInfo = connectionPoolManager.GetConnectionInformations();
+            return Ok(new { RedisInfo = redisInfo, ConnectionInfo = connectionInfo });
         }
     }
 }
diff --git a/...tackExchange.Redis.Extensions.AspNetCore/StackExchange.Redis.Extensions.AspNetCore.csproj b/...tackExchange.Redis.Extensions.AspNetCore/StackExchange.Redis.Extensions.AspNetCore.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...re/StackExchange.Redis.Extensions.Core/Implementations/RedisCacheConnectionPoolManager.cs b/...re/StackExchange.Redis.Extensions.Core/Implementations/RedisCacheConnectionPoolManager.cs
@@ -50,7 +50,7 @@ public IConnectionMultiplexer GetConnection()
         {
             this.EmitConnections();
 
-            var loadedLazies = this.connections.Where(lazy => lazy.IsValueCreated);
+            var loadedLazies = this.connections.Where(lazy => lazy.IsValueCreated && lazy.Value.IsValid() && lazy.Value.IsConnected());
 
             if (loadedLazies.Count() == this.connections.Count)
                 return (ConnectionMultiplexer)this.connections.OrderBy(x => x.Value.TotalOutstanding()).First().Value;

diff --git a/src/core/StackExchange.Redis.Extensions.Core/StackExchange.Redis.Extensions.Core.csproj b/src/core/StackExchange.Redis.Extensions.Core/StackExchange.Redis.Extensions.Core.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.0.519" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.30" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
   </ItemGroup>
 </Project>
diff --git a/...rs/StackExchange.Redis.Extensions.Protobuf/StackExchange.Redis.Extensions.Protobuf.csproj b/...rs/StackExchange.Redis.Extensions.Protobuf/StackExchange.Redis.Extensions.Protobuf.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="2.4.4" />
+    <PackageReference Include="protobuf-net" Version="2.4.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/targets/Targets.csproj b/targets/Targets.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bullseye" Version="3.2.0" />
+    <PackageReference Include="Bullseye" Version="3.3.0" />
     <PackageReference Include="Colorful.Console" Version="1.2.10" />
     <PackageReference Include="SimpleExec" Version="6.2.0" />
   </ItemGroup>

diff --git a/...tackExchange.Redis.Extensions.Core.Tests/StackExchange.Redis.Extensions.Core.Tests.csproj b/...tackExchange.Redis.Extensions.Core.Tests/StackExchange.Redis.Extensions.Core.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0">
+    <PackageReference Include="coverlet.collector" Version="1.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>