diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-16 18:10:03 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-04 17:00:09 +0200 |
| commit | 0163e27631fb993bd3541c09a95f0ef5e2026455 (patch) | |
| tree | b63cff41fe7d6e7433ecacfefd8be17e4fa29422 /config/application.rb | |
| parent | ba7fcc9866588eb215fc69f5d8b73c77805e4eef (diff) | |
| download | gitlab-ce-0163e27631fb993bd3541c09a95f0ef5e2026455.tar.gz | |
Add Gitlab::Redis connection pool
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 5a0ac70aa2a..9633084d603 100644 --- a/config/application.rb +++ b/config/application.rb @@ -4,7 +4,7 @@ require 'rails/all' require 'devise' I18n.config.enforce_available_locales = false Bundler.require(:default, Rails.env) -require_relative '../lib/gitlab/redis_config' +require_relative '../lib/gitlab/redis' module Gitlab REDIS_CACHE_NAMESPACE = 'cache:gitlab' @@ -69,7 +69,7 @@ module Gitlab end end - redis_config_hash = Gitlab::RedisConfig.redis_store_options + redis_config_hash = Gitlab::Redis.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 |