diff --git a/config/application.rb b/config/application.rb index 9633084d6039a1f49b9062a066f8d971071a014c..2e2ed48db07432d1c5c4901b4d4fc1f41fecb661 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,8 +7,6 @@ Bundler.require(:default, Rails.env) require_relative '../lib/gitlab/redis' module Gitlab - REDIS_CACHE_NAMESPACE = 'cache:gitlab' - class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -70,7 +68,7 @@ module Gitlab end redis_config_hash = Gitlab::Redis.redis_store_options - redis_config_hash[:namespace] = REDIS_CACHE_NAMESPACE + redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever config.cache_store = :redis_store, redis_config_hash diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb index 8c3aea2627c76a9e739a203f2160bed64d039e85..319447669dc3e2244fab38e164be808ffab6cd70 100644 --- a/lib/gitlab/redis.rb +++ b/lib/gitlab/redis.rb @@ -1,5 +1,7 @@ module Gitlab class Redis + CACHE_NAMESPACE = 'cache:gitlab' + attr_reader :url # To be thread-safe we must be careful when writing the class instance diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake index 6c2e2e914946cde03db916b1f0b56022a7e6d45a..2214f855200e4c8984ab3cb65b2cb549d9ad1833 100644 --- a/lib/tasks/cache.rake +++ b/lib/tasks/cache.rake @@ -9,7 +9,7 @@ namespace :cache do loop do cursor, keys = redis.scan( cursor, - match: "#{Gitlab::REDIS_CACHE_NAMESPACE}*", + match: "#{Gitlab::Redis::CACHE_NAMESPACE}*", count: CLEAR_BATCH_SIZE )