Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gloster <robin@loc-com.de>2013-08-14 02:02:27 +0400
committerRobin Gloster <robin@loc-com.de>2013-08-14 02:02:27 +0400
commit2b904cb34fcc9408b49e866976eaa7e82f032184 (patch)
tree67f5211171a4c211f9987014bdf31de4092ce36e /config/environments
parentb6fdca9c81e617062f86bcd3a1d4d35f058faad1 (diff)
Fix caching when using remote redis server
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/production.rb9
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"