Give the Rails cache its own Redis namespace

Before this change, Rails cache data was stored in a global Redis
namespace. As a consequence, clearing the Rails cache (`rake
cache:clear`) would also delete all Sidekiq queue data and session
storage. This change puts all Rails cache data in a `cache:gitlab`
namespace, making `rake cache:clear` safe again.

2 files changed, 2 insertions, 2 deletions

diff --git a/config/environments/production.rb b/config/environments/production.rb
index ad3c03d8fc9..47f7e17aeb6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -53,7 +53,7 @@ Gitlab::Application.configure do
                else
                  "redis://localhost:6379"
                end
-  config.cache_store = :redis_store, resque_url
+  config.cache_store = :redis_store, resque_url, {namespace: 'cache:gitlab'}
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index f80b67a554b..5fe5270236b 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,7 +2,7 @@
 
 Gitlab::Application.config.session_store(
   :redis_store, # Using the cookie_store would enable session replay attacks.
-  servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store
+  servers: Gitlab::Application.config.cache_store[1], # re-use the Redis config from the Rails cache store
   key: '_gitlab_session',
   secure: Gitlab.config.gitlab.https,
   httponly: true,