diff --git a/KamihamaWeb/Services/MasterListBuilder.cs b/KamihamaWeb/Services/MasterListBuilder.cs index 3b4f75c..12706be 100644 --- a/KamihamaWeb/Services/MasterListBuilder.cs +++ b/KamihamaWeb/Services/MasterListBuilder.cs @@ -22,14 +22,14 @@ namespace KamihamaWeb.Services private readonly Regex _multiPartRegex = new Regex(@"\.a[a-z]{2}"); // A bit crude private IDiskCacheSingleton _disk; - private IDatabase _cache; + //private IDatabase _cache; - public MasterListBuilder(IDiskCacheSingleton disk, IDistributedCache cache) + public MasterListBuilder(IDiskCacheSingleton disk) { BasePathLength = @"MagiRecoStatic/magica/resource/download/asset/master/resource/".Length; - _cache = ((RedisCache)cache).GetConnection().GetDatabase(); + // _cache = ((RedisCache)cache).GetConnection().GetDatabase(); _disk = disk; } diff --git a/KamihamaWeb/Services/MasterService.cs b/KamihamaWeb/Services/MasterService.cs index 2ae816c..2aa01f2 100644 --- a/KamihamaWeb/Services/MasterService.cs +++ b/KamihamaWeb/Services/MasterService.cs @@ -18,23 +18,25 @@ namespace KamihamaWeb.Services public class MasterService: IMasterSingleton { - private IDatabase _cache { get; set; } + // private IDatabase _cache { get; set; } private IConfiguration _config { get; set; } private IRestSharpTransient _rest { get; set; } private IMasterListBuilder _builder { get; set; } public MasterService( - IDistributedCache cache, + //IDistributedCache cache, IConfiguration config, IRestSharpTransient rest, IMasterListBuilder builder - ) : this(Guid.NewGuid(), cache, config, rest, builder) + ) : this(Guid.NewGuid(), + //cache, + config, rest, builder) { } public MasterService( Guid guid, - IDistributedCache cache, + //IDistributedCache cache, IConfiguration config, IRestSharpTransient rest, IMasterListBuilder builder @@ -42,7 +44,7 @@ namespace KamihamaWeb.Services { Guid = guid; _config = config; - _cache = ((RedisCache) cache).GetConnection().GetDatabase(); + //_cache = ((RedisCache) cache).GetConnection().GetDatabase(); _rest = rest; _builder = builder; diff --git a/KamihamaWeb/Startup.cs b/KamihamaWeb/Startup.cs index 95db235..2fddfae 100644 --- a/KamihamaWeb/Startup.cs +++ b/KamihamaWeb/Startup.cs @@ -28,11 +28,11 @@ namespace KamihamaWeb // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - services.AddStackExchangeRedisCache(action => + /*services.AddStackExchangeRedisCache(action => { action.InstanceName = Configuration["DatabaseConfiguration:RedisInstanceName"]; action.Configuration = Configuration["DatabaseConfiguration:RedisConfiguration"]; - }); + });*/ services.AddHttpCacheHeaders(); services.AddControllersWithViews();