Merge branch 'move-rails-cache-options-to-redis-cache' into 'master'

Move Rails cache options to Gitlab::Redis::Cache

See merge request gitlab-org/gitlab!71389

config/application.rb

@@ -372,15 +372,7 @@ module Gitlab
     end
 
     # Use caching across all environments
-    # Full list of options:
-    # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new
-    caching_config_hash = {}
-    caching_config_hash[:redis] = Gitlab::Redis::Cache.pool
-    caching_config_hash[:compress] = Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1'))
-    caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
-    caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
-
-    config.cache_store = :redis_cache_store, caching_config_hash
+    config.cache_store = :redis_cache_store, Gitlab::Redis::Cache.active_support_config
 
     config.active_job.queue_adapter = :sidekiq
 

lib/gitlab/redis/cache.rb

@@ -4,6 +4,17 @@ module Gitlab
   module Redis
     class Cache < ::Gitlab::Redis::Wrapper
       CACHE_NAMESPACE = 'cache:gitlab'
+
+      # Full list of options:
+      # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new
+      def self.active_support_config
+        {
+          redis: pool,
+          compress: Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1')),
+          namespace: CACHE_NAMESPACE,
+          expires_in: 2.weeks # Cache should not grow forever
+        }
+      end
     end
   end
 end