Merge branch 'redis_settings'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

2 files changed, 21 insertions, 1 deletions

diff --git a/config/initializers/7_cache_settings.rb b/config/initializers/7_cache_settings.rb
new file mode 100644
index 00000000000..5367a4d431c
--- /dev/null
+++ b/config/initializers/7_cache_settings.rb
@@ -0,0 +1,20 @@
+Gitlab::Application.configure do
+  redis_config_file = Rails.root.join('config', 'resque.yml')
+
+  redis_url_string = if File.exists?(redis_config_file)
+                       YAML.load_file(redis_config_file)[Rails.env]
+                     else
+                       "redis://localhost:6379"
+                     end
+
+  # Redis::Store does not handle Unix sockets well, so let's do it for them
+  redis_config_hash = Redis::Store::Factory.extract_host_options_from_uri(redis_url_string)
+  redis_uri = URI.parse(redis_url_string)
+  if redis_uri.scheme == 'unix'
+    redis_config_hash[:path] = redis_uri.path
+  end
+
+  redis_config_hash[:namespace] = 'cache:gitlab'
+
+  config.cache_store = :redis_store, redis_config_hash
+end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index b3fa648f2a6..b2d59f1c4b7 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[1], # re-use the Redis config from the Rails cache store
+  servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
   key: '_gitlab_session',
   secure: Gitlab.config.gitlab.https,
   httponly: true,