Add constructor overloads to RedisClient that take a non-lazy loaded ConnectionMultiplexer

Author: steelheaddigital

README.md

@@ -40,7 +40,7 @@ In your startup.cs file add the following in the ConfigureServices method replac
 // Configure Redis connection
 var redisConfigOptions = ConfigurationOptions.Parse("127.0.0.1:6379");
 redisConfigOptions.AbortOnConnectFail = false;
-services.AddSingleton(new Lazy<IConnectionMultiplexer>(() => ConnectionMultiplexer.Connect(redisConfigOptions)));
+services.AddSingleton<IConnectionMultiplexer>(ConnectionMultiplexer.Connect(redisConfigOptions));
 ```
 \* **For production environments it is recommended that you turn on [persistence features](https://redis.io/topics/persistence) in Redis to preserve your message queues in the event that Redis crashes or is restarted.**
 

sample/Learning.EventStore.Sample.Web/Startup.cs

@@ -59,7 +59,7 @@ public void ConfigureServices(IServiceCollection services)
             // Configure Redis Connection
             var redisConfigOptions = ConfigurationOptions.Parse("localhost:6379");
             redisConfigOptions.AbortOnConnectFail = false;
-            services.AddSingleton(new Lazy<IConnectionMultiplexer>(() => ConnectionMultiplexer.Connect(redisConfigOptions)));
+            services.AddSingleton<IConnectionMultiplexer>(ConnectionMultiplexer.Connect(redisConfigOptions));
 
             // Set up EventStore
             var keyPrefix = "Learning.EventStore.Sample.Web";
@@ -69,7 +69,7 @@ public void ConfigureServices(IServiceCollection services)
                 ApplicationName = keyPrefix,
                 EnableCompression = false
             };
-            services.AddSingleton<IRedisClient>(y => new RedisClient(y.GetService<Lazy<IConnectionMultiplexer>>()));
+            services.AddSingleton<IRedisClient>(y => new RedisClient(y.GetService<IConnectionMultiplexer>()));
             services.AddSingleton<IEventSubscriber>(y => new RedisEventSubscriber(y.GetService<IRedisClient>(), keyPrefix, y.GetService<IHostingEnvironment>().EnvironmentName));
             services.AddScoped<ISession, Session>();
             services.AddSingleton<IMessageQueue>(y => new RedisMessageQueue(y.GetService<IRedisClient>(), keyPrefix, y.GetService<IHostingEnvironment>().EnvironmentName));

src/Learning.EventStore.Common/Redis/RedisClient.cs

@@ -7,9 +7,9 @@ namespace Learning.EventStore.Common.Redis
 {
     public class RedisClient : IRedisClient, IDisposable
     {
-        private readonly Lazy<IConnectionMultiplexer> _redis;
+        private readonly IConnectionMultiplexer _redisConnection;
 
-        public IDatabase Database => _redis.Value.GetDatabase();
+        public IDatabase Database => _redisConnection.GetDatabase();
 
         private readonly int _retryCount;
 
@@ -29,14 +29,33 @@ public class RedisClient : IRedisClient, IDisposable
                     retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)) // exponential backoff
                 );
 
-        public RedisClient(Lazy<IConnectionMultiplexer> redis)
-            : this(redis, 3)
+        /// <summary>
+        /// DEPRECATED: Use the constructor that takes a non-lazy loaded IConnectionMultiplexer
+        /// </summary>
+        /// <param name="redisConnection"></param>
+        public RedisClient(Lazy<IConnectionMultiplexer> redisConnection)
+            : this(redisConnection, 3)
         {
         }
 
-        public RedisClient(Lazy<IConnectionMultiplexer> redis, int retryCount)
+        /// <summary>
+        /// DEPRECATED: Use the constructor that takes a non-lazy loaded IConnectionMultiplexer
+        /// </summary>
+        /// <param name="redisConnection"></param>
+        /// <param name="retryCount"></param>
+        public RedisClient(Lazy<IConnectionMultiplexer> redisConnection, int retryCount)
+            : this(redisConnection.Value, retryCount)
         {
-            _redis = redis;
+        }
+
+        public RedisClient(IConnectionMultiplexer redisConnectionConnection)
+            : this(redisConnectionConnection, 3)
+        {
+        }
+
+        public RedisClient(IConnectionMultiplexer redisConnectionConnection, int retryCount)
+        {
+            _redisConnection = redisConnectionConnection;
             _retryCount = retryCount;
         }
 
@@ -108,12 +127,12 @@ public long ListRemove(RedisKey key, RedisValue value)
 
         public async Task PublishAsync(RedisChannel channel, RedisValue value)
         {
-            await RetryPolicyAsync.ExecuteAsync(() => _redis.Value.GetSubscriber().PublishAsync(channel, value)).ConfigureAwait(false);
+            await RetryPolicyAsync.ExecuteAsync(() => _redisConnection.GetSubscriber().PublishAsync(channel, value)).ConfigureAwait(false);
         }
 
         public async Task SubscribeAsync(RedisChannel channel, Action<RedisChannel, RedisValue> handler)
         {
-            await RetryPolicyAsync.ExecuteAsync(() => _redis.Value.GetSubscriber().SubscribeAsync(channel, handler)).ConfigureAwait(false);
+            await RetryPolicyAsync.ExecuteAsync(() => _redisConnection.GetSubscriber().SubscribeAsync(channel, handler)).ConfigureAwait(false);
         }
 
         public async Task<string> StringGetAsync(string key)
@@ -218,7 +237,7 @@ public async Task<bool> ExecuteTransactionAsync(ITransaction trans)
 
         public void Dispose()
         {
-            _redis.Value.Dispose();
+            _redisConnection.Dispose();
         }
     }
 }

src/Learning.EventStore/Learning.EventStore.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>Learning.EventStore</AssemblyTitle>
-    <VersionPrefix>11.0.1</VersionPrefix>
+    <VersionPrefix>11.0.2</VersionPrefix>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Learning.EventStore</AssemblyName>
     <PackageId>Learning.EventStore</PackageId>

src/Learning.MessageQueue/Learning.MessageQueue.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>Learning.MessageQueue</AssemblyTitle>
-    <VersionPrefix>4.0.1</VersionPrefix>
+    <VersionPrefix>4.0.2</VersionPrefix>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Learning.MessageQueue</AssemblyName>
     <PackageId>Learning.MessageQueue</PackageId>