add cache file repository

ThreeMammals · Oct 13, 2023 · 2825067 · 2825067
1 parent 6d64de8
commit 2825067
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/src/Ocelot.Provider.Consul/ConsulFileConfigurationRepository.cs b/src/Ocelot.Provider.Consul/ConsulFileConfigurationRepository.cs
@@ -66,10 +66,10 @@ public async Task<Response> Set(FileConfiguration ocelotConfiguration)
             Value = bytes,
         };
 
-        var result = await _consul.KV.Put(kvPair);
-        if (result.Response)
-        {
-            _cache.AddAndDelete(_configurationKey, ocelotConfiguration, TimeSpan.FromSeconds(3), _configurationKey);
+            var result = await _consul.KV.Put(kvPair);
+            if (result.Response)
+            {
+                _cache.AddAndDelete(_configurationKey, ocelotConfiguration, TimeSpan.FromSeconds(5), _configurationKey);
 
             return new OkResponse();
         }

diff --git a/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs b/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs
@@ -41,7 +41,7 @@ await httpContext.AuthenticateAsync(downstreamRoute.AuthenticationOptions
 
                     userClaim = result.Principal;
 
-                    _memoryCache.Set(cacheKey, userClaim, TimeSpan.FromMinutes(10));
+                    _memoryCache.Set(cacheKey, userClaim, TimeSpan.FromMinutes(5));
                 }
 
                 httpContext.User = userClaim;

diff --git a/src/Ocelot/Configuration/Repository/DiskFileConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/DiskFileConfigurationRepository.cs
@@ -9,21 +9,31 @@ namespace Ocelot.Configuration.Repository
     public class DiskFileConfigurationRepository : IFileConfigurationRepository
     {
         private readonly IOcelotConfigurationChangeTokenSource _changeTokenSource;
+        private readonly IOcelotCache<FileConfiguration> _cache;
         private readonly string _environmentFilePath;
         private readonly string _ocelotFilePath;
+        private readonly string _cacheKey;
         private static readonly object _lock = new();
         private const string ConfigurationFileName = "ocelot";
 
-        public DiskFileConfigurationRepository(IWebHostEnvironment hostingEnvironment, IOcelotConfigurationChangeTokenSource changeTokenSource)
+        public DiskFileConfigurationRepository(IWebHostEnvironment hostingEnvironment,
+            IOcelotConfigurationChangeTokenSource changeTokenSource, Cache.IOcelotCache<FileConfiguration> cache)
         {
             _changeTokenSource = changeTokenSource;
+            _cache = cache;
             _environmentFilePath = $"{AppContext.BaseDirectory}{ConfigurationFileName}{(string.IsNullOrEmpty(hostingEnvironment.EnvironmentName) ? string.Empty : ".")}{hostingEnvironment.EnvironmentName}.json";
+            _cacheKey = "InternalDiskFileConfigurationRepository";
 
             _ocelotFilePath = $"{AppContext.BaseDirectory}{ConfigurationFileName}.json";
         }
 
         public Task<Response<FileConfiguration>> Get()
         {
+            var configuration = _cache.Get(_cacheKey, _cacheKey);
+
+            if (configuration != null)
+                return Task.FromResult<Response<FileConfiguration>>(new OkResponse<FileConfiguration>(configuration));
+
             string jsonConfiguration;
 
             lock (_lock)
@@ -58,6 +68,9 @@ public Task<Response> Set(FileConfiguration fileConfiguration)
             }
 
             _changeTokenSource.Activate();
+
+            _cache.AddAndDelete(_cacheKey, fileConfiguration, TimeSpan.FromMinutes(5), _cacheKey);
+
             return Task.FromResult<Response>(new OkResponse());
         }
     }

diff --git a/test/Ocelot.UnitTests/Configuration/DiskFileConfigurationRepositoryTests.cs b/test/Ocelot.UnitTests/Configuration/DiskFileConfigurationRepositoryTests.cs
@@ -3,7 +3,7 @@
 using Ocelot.Configuration.ChangeTracking;
 using Ocelot.Configuration.File;
 using Ocelot.Configuration.Repository;
-
+
 namespace Ocelot.UnitTests.Configuration
 {
     public class DiskFileConfigurationRepositoryTests : IDisposable
@@ -31,7 +31,8 @@ public DiskFileConfigurationRepositoryTests()
             _hostingEnvironment.Setup(he => he.EnvironmentName).Returns(_environmentName);
             _changeTokenSource = new Mock<IOcelotConfigurationChangeTokenSource>(MockBehavior.Strict);
             _changeTokenSource.Setup(m => m.Activate());
-            _repo = new DiskFileConfigurationRepository(_hostingEnvironment.Object, _changeTokenSource.Object);
+            var aspMemoryCache = new AspMemoryCache<FileConfiguration>(new MemoryCache(new MemoryCacheOptions()));
+            _repo = new DiskFileConfigurationRepository(_hostingEnvironment.Object, _changeTokenSource.Object, aspMemoryCache);
         }
 
         [Fact]
@@ -114,7 +115,8 @@ private void GivenTheEnvironmentNameIsUnavailable()
         {
             _environmentName = null;
             _hostingEnvironment.Setup(he => he.EnvironmentName).Returns(_environmentName);
-            _repo = new DiskFileConfigurationRepository(_hostingEnvironment.Object, _changeTokenSource.Object);
+            var aspMemoryCache = new AspMemoryCache<FileConfiguration>(new MemoryCache(new MemoryCacheOptions()));
+            _repo = new DiskFileConfigurationRepository(_hostingEnvironment.Object, _changeTokenSource.Object, aspMemoryCache);
         }
 
         private void GivenIHaveAConfiguration(FileConfiguration fileConfiguration)