diff options
| author | Rubén Dávila Santos <ruben@gitlab.com> | 2016-09-22 00:08:08 +0000 |
|---|---|---|
| committer | Rubén Dávila Santos <ruben@gitlab.com> | 2016-09-22 00:08:08 +0000 |
| commit | 73b4eecddecf1e86d5e0c26166e2027583b680cf (patch) | |
| tree | 2aeeeb27d587fc2feb3a856749648d6aa42774aa /config/application.rb | |
| parent | b62995fe04f872c978d285715a028137d181d78e (diff) | |
| download | gitlab-ce-73b4eecddecf1e86d5e0c26166e2027583b680cf.tar.gz | |
Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"
This reverts merge request !6429
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 8166b6003f6..4792f6670a8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -116,10 +116,6 @@ module Gitlab redis_config_hash = Gitlab::Redis.params redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever - if Sidekiq.server? # threaded context - redis_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5 - redis_config_hash[:pool_timeout] = 1 - end config.cache_store = :redis_store, redis_config_hash config.active_record.raise_in_transactional_callbacks = true |