Redis configuration consistency

This commit is contained in:
Valery Sizov 2016-04-13 13:20:57 +03:00
parent 8cb41f1989
commit 2244aaf98f
3 changed files with 5 additions and 5 deletions

View file

@ -14,7 +14,7 @@ if Rails.env.test?
Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session"
else
redis_config = Gitlab::Redis.redis_store_options
redis_config[:namespace] = 'session:gitlab'
redis_config[:namespace] = Gitlab::Redis::SESSION_NAMESPACE
Gitlab::Application.config.session_store(
:redis_store, # Using the cookie_store would enable session replay attacks.

View file

@ -1,9 +1,7 @@
SIDEKIQ_REDIS_NAMESPACE = 'resque:gitlab'
Sidekiq.configure_server do |config|
config.redis = {
url: Gitlab::Redis.url,
namespace: SIDEKIQ_REDIS_NAMESPACE
namespace: Gitlab::Redis::SIDEKIQ_NAMESPACE
}
config.server_middleware do |chain|
@ -30,6 +28,6 @@ end
Sidekiq.configure_client do |config|
config.redis = {
url: Gitlab::Redis.url,
namespace: SIDEKIQ_REDIS_NAMESPACE
namespace: Gitlab::Redis::SIDEKIQ_NAMESPACE
}
end

View file

@ -1,6 +1,8 @@
module Gitlab
class Redis
CACHE_NAMESPACE = 'cache:gitlab'
SESSION_NAMESPACE = 'session:gitlab'
SIDEKIQ_NAMESPACE = 'resque:gitlab'
attr_reader :url