diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-04-13 18:34:11 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-04-13 18:34:11 +0000 |
| commit | c0678f2d281242601560e2646cab1aa8a349c4bb (patch) | |
| tree | a330217fe89bada13ce96b6b05616cef55e0c80d | |
| parent | 31d9f655531f22abd8bbbc66afc9affd48d76220 (diff) | |
| parent | 2244aaf98f6c9b68e30febf6b80f2c0d965e541a (diff) | |
| download | gitlab-ce-c0678f2d281242601560e2646cab1aa8a349c4bb.tar.gz | |
Merge branch 'redis_config_consistency' into 'master'
Redis configuration consistency
Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e
See merge request !3697
| -rw-r--r-- | config/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 6 | ||||
| -rw-r--r-- | lib/gitlab/redis.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 70285255877..88cb859871c 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -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. diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9182d929809..f1eec674888 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -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 diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb index 319447669dc..5c352c96de5 100644 --- a/lib/gitlab/redis.rb +++ b/lib/gitlab/redis.rb @@ -1,6 +1,8 @@ module Gitlab class Redis CACHE_NAMESPACE = 'cache:gitlab' + SESSION_NAMESPACE = 'session:gitlab' + SIDEKIQ_NAMESPACE = 'resque:gitlab' attr_reader :url |