summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-03-09 15:16:46 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-03-09 15:16:46 +0100
commitc46e6eff104891ca4e404605ad3bf302a3aad9c7 (patch)
tree36552d841679239cad915ddbb2e2721d89f8a962 /config/application.rb
parent500337c4b23700a30876c6d2f8e7c612f8114432 (diff)
downloadgitlab-ce-c46e6eff104891ca4e404605ad3bf302a3aad9c7.tar.gz
Parse config/resque.yml in one place only
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb18
1 files changed, 2 insertions, 16 deletions
diff --git a/config/application.rb b/config/application.rb
index 7fd75ebe69e..d8d1e7b4679 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,6 +4,7 @@ require 'rails/all'
require 'devise'
I18n.config.enforce_available_locales = false
Bundler.require(:default, Rails.env)
+require_relative '../lib/gitlab/redis_config'
module Gitlab
REDIS_CACHE_NAMESPACE = 'cache:gitlab'
@@ -67,22 +68,7 @@ module Gitlab
end
end
- # Use Redis caching across all environments
- 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 = Gitlab::RedisConfig.redis_store_options
redis_config_hash[:namespace] = REDIS_CACHE_NAMESPACE
redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
config.cache_store = :redis_store, redis_config_hash