Allow cache-redis to be disabled separately from grails-cache

erik-h · erik-h · commit a856cb4eb87d · 2021-03-17T12:53:17.000-06:00
There is now a separate `grails.cache.redis.enabled` config option to allow the cache-redis plugin to be disabled while still having the grails-cache plugin enabled. The change is based off of [this pull request](grails-plugins#8).
diff --git a/src/main/groovy/grails/plugin/cache/redis/CacheRedisGrailsPlugin.groovy b/src/main/groovy/grails/plugin/cache/redis/CacheRedisGrailsPlugin.groovy
@@ -35,7 +35,7 @@ class CacheRedisGrailsPlugin extends Plugin {
 
     def author = "Burt Beckwith"
     def authorEmail = "burt@burtbeckwith.com"
-    
+
     def profiles = ['web']
 
     String documentation = 'http://grails-plugins.github.io/grails-cache-redis/'
@@ -50,13 +50,14 @@ class CacheRedisGrailsPlugin extends Plugin {
 
     Closure doWithSpring() {
         {->
-            if (!enabled) {
+            def cacheConfig = grailsApplication.config.grails.cache
+            def redisCacheConfig = cacheConfig.redis
+			boolean pluginEnabled = (redisCacheConfig.enabled instanceof Boolean) ? redisCacheConfig.enabled : true
+            if (!pluginEnabled) {
                 log.warn 'Redis Cache plugin is disabled'
                 return
             }
 
-            def cacheConfig = grailsApplication.config.grails.cache
-            def redisCacheConfig = cacheConfig.redis
             int configDatabase = redisCacheConfig.database ?: 0
             boolean configUsePool = (redisCacheConfig.usePool instanceof Boolean) ? redisCacheConfig.usePool : true
             String configHostName = redisCacheConfig.hostName ?: 'localhost'
