Merge pull request #2 from ArchitectNow/release/7.3.0

Release/7.3.0
ArchitectNow · Aug 7, 2019 · a26b595 · a26b595
2 parents 3db06ea + ddffe19
commit a26b595
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/ArchitectNow.Caching/CacheKeeper.cs b/src/ArchitectNow.Caching/CacheKeeper.cs
@@ -27,10 +27,18 @@ public CacheKeeper(ILogger<CacheKeeper<T>> log, IOptions<RedisOptions> redisOpti
                 return;
             }
 
+            var inMemoryExpirationInSeconds = cachingOptions.Value.InMemoryExpirationInSeconds < 0
+                ? CachingConstants.InMemoryDefaultExpirationInSeconds
+                : cachingOptions.Value.InMemoryExpirationInSeconds;
+
+            var redisExpirationInSeconds = redisOptions.Value.ExpirationInSeconds < 0
+                ? CachingConstants.RedisDefaultExpirationInSeconds
+                : redisOptions.Value.ExpirationInSeconds;
+
             _inMemory = CacheFactory.Build<T>(
                 s => s
                     .WithDictionaryHandle()
-                    .WithExpiration(ExpirationMode.Sliding, TimeSpan.FromSeconds(5)));
+                    .WithExpiration(ExpirationMode.Sliding, TimeSpan.FromSeconds(inMemoryExpirationInSeconds)));
 
             var multiplexer = Create();
 
@@ -65,10 +73,11 @@ public CacheKeeper(ILogger<CacheKeeper<T>> log, IOptions<RedisOptions> redisOpti
                     s
                         .WithJsonSerializer(jsonSerializerSettings, jsonSerializerSettings)
                         .WithDictionaryHandle()
-                        .WithExpiration(ExpirationMode.Absolute, TimeSpan.FromMinutes(30))
+                        .WithExpiration(ExpirationMode.Absolute, TimeSpan.FromSeconds(inMemoryExpirationInSeconds))
                         .And
                         .WithRedisConfiguration("redis", multiplexer)
-                        .WithRedisCacheHandle("redis");
+                        .WithRedisCacheHandle("redis")
+                        .WithExpiration(ExpirationMode.Absolute, TimeSpan.FromSeconds(redisExpirationInSeconds));
                 });
         }
 

diff --git a/src/ArchitectNow.Caching/CachingConstants.cs b/src/ArchitectNow.Caching/CachingConstants.cs
@@ -0,0 +1,8 @@
+namespace ArchitectNow.Caching
+{
+    public class CachingConstants
+    {
+        public const int InMemoryDefaultExpirationInSeconds = 60;
+        public const int RedisDefaultExpirationInSeconds = 1800;
+    }
+}
diff --git a/src/ArchitectNow.Caching/CachingOptions.cs b/src/ArchitectNow.Caching/CachingOptions.cs
@@ -3,5 +3,7 @@
     class CachingOptions
     {
         public bool Enabled { get; set; } = false;
+
+        public int InMemoryExpirationInSeconds { get; set; } = CachingConstants.InMemoryDefaultExpirationInSeconds;
     }
 }
diff --git a/src/ArchitectNow.Caching/RedisOptions.cs b/src/ArchitectNow.Caching/RedisOptions.cs
@@ -4,5 +4,6 @@ class RedisOptions
     {
         public string ConnectionString { get; set; }
         public bool Enabled { get; set; }
+        public int ExpirationInSeconds { get; set; } = CachingConstants.RedisDefaultExpirationInSeconds;
     }
 }