Merge pull request #4775 from globin/remote_cache_redis

Fix caching when using remote redis server

1 files changed, 8 insertions, 1 deletions

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2e2d46c4161..e3476be8fba 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -40,7 +40,14 @@ Gitlab::Application.configure do
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
-  config.cache_store = :redis_store
+  config_file = Rails.root.join('config', 'resque.yml')
+
+  resque_url = if File.exists?(config_file)
+                 YAML.load_file(config_file)[Rails.env]
+               else
+                 "redis://localhost:6379"
+               end
+  config.cache_store = :redis_store, resque_url
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"