From 73c0ba40d741f7f784c9c4dd4ee4ebcfd55ba21b Mon Sep 17 00:00:00 2001 From: rachanee-mwp Date: Thu, 8 Oct 2020 16:18:08 +0700 Subject: [PATCH] Revert changes for Redis option --- docs/en/Redis-Cache.md | 2 ++ .../AbpCachingStackExchangeRedisModule.cs | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docs/en/Redis-Cache.md b/docs/en/Redis-Cache.md index 42679679c6..3e11584bce 100644 --- a/docs/en/Redis-Cache.md +++ b/docs/en/Redis-Cache.md @@ -25,9 +25,11 @@ Volo.Abp.Caching.StackExchangeRedis package automatically gets the redis [config ````js "Redis": { + "IsEnabled": "true", "Configuration": "127.0.0.1" } ```` +The setting `IsEnabled` is optional and will be considered `true` if it is not set. Alternatively you can configure the standard [RedisCacheOptions](https://docs.microsoft.com/en-us/dotnet/api/microsoft.extensions.caching.stackexchangeredis.rediscacheoptions) [options](Options.md) class in the `ConfigureServices` method of your [module](Module-Development-Basics.md): diff --git a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpCachingStackExchangeRedisModule.cs b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpCachingStackExchangeRedisModule.cs index b0f7d68ee4..0f71cbdd25 100644 --- a/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpCachingStackExchangeRedisModule.cs +++ b/framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpCachingStackExchangeRedisModule.cs @@ -14,17 +14,21 @@ namespace Volo.Abp.Caching.StackExchangeRedis public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - - context.Services.AddStackExchangeRedisCache(options => + + var redisEnabled = configuration["Redis:IsEnabled"]; + if (redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled)) { - var redisConfiguration = configuration["Redis:Configuration"]; - if (!redisConfiguration.IsNullOrEmpty()) + context.Services.AddStackExchangeRedisCache(options => { - options.Configuration = configuration["Redis:Configuration"]; - } - }); + var redisConfiguration = configuration["Redis:Configuration"]; + if (!redisConfiguration.IsNullOrEmpty()) + { + options.Configuration = redisConfiguration; + } + }); - context.Services.Replace(ServiceDescriptor.Singleton()); + context.Services.Replace(ServiceDescriptor.Singleton()); + } } } } \ No newline at end of file