Merge branch 'sh-use-redis-caching-store' into 'master'
Use Rails 5.2 Redis caching store Closes #64794 See merge request gitlab-org/gitlab-ce!30966
This commit is contained in:
commit
fa216b0e86
8
Gemfile
8
Gemfile
|
@ -200,13 +200,13 @@ gem 'js_regex', '~> 3.1'
|
||||||
# User agent parsing
|
# User agent parsing
|
||||||
gem 'device_detector'
|
gem 'device_detector'
|
||||||
|
|
||||||
# Cache
|
|
||||||
gem 'redis-rails', '~> 5.0.2'
|
|
||||||
|
|
||||||
# Redis
|
# Redis
|
||||||
gem 'redis', '~> 3.2'
|
gem 'redis', '~> 4.0'
|
||||||
gem 'connection_pool', '~> 2.0'
|
gem 'connection_pool', '~> 2.0'
|
||||||
|
|
||||||
|
# Redis session store
|
||||||
|
gem 'redis-rails', '~> 5.0.2'
|
||||||
|
|
||||||
# Discord integration
|
# Discord integration
|
||||||
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
|
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
|
||||||
|
|
||||||
|
|
|
@ -741,17 +741,17 @@ GEM
|
||||||
recaptcha (4.13.1)
|
recaptcha (4.13.1)
|
||||||
json
|
json
|
||||||
recursive-open-struct (1.1.0)
|
recursive-open-struct (1.1.0)
|
||||||
redis (3.3.5)
|
redis (4.1.2)
|
||||||
redis-actionpack (5.0.2)
|
redis-actionpack (5.0.2)
|
||||||
actionpack (>= 4.0, < 6)
|
actionpack (>= 4.0, < 6)
|
||||||
redis-rack (>= 1, < 3)
|
redis-rack (>= 1, < 3)
|
||||||
redis-store (>= 1.1.0, < 2)
|
redis-store (>= 1.1.0, < 2)
|
||||||
redis-activesupport (5.0.4)
|
redis-activesupport (5.0.7)
|
||||||
activesupport (>= 3, < 6)
|
activesupport (>= 3, < 6)
|
||||||
redis-store (>= 1.3, < 2)
|
redis-store (>= 1.3, < 2)
|
||||||
redis-namespace (1.6.0)
|
redis-namespace (1.6.0)
|
||||||
redis (>= 3.0.4)
|
redis (>= 3.0.4)
|
||||||
redis-rack (2.0.4)
|
redis-rack (2.0.5)
|
||||||
rack (>= 1.5, < 3)
|
rack (>= 1.5, < 3)
|
||||||
redis-store (>= 1.2, < 2)
|
redis-store (>= 1.2, < 2)
|
||||||
redis-rails (5.0.2)
|
redis-rails (5.0.2)
|
||||||
|
@ -1197,7 +1197,7 @@ DEPENDENCIES
|
||||||
rdoc (~> 6.0)
|
rdoc (~> 6.0)
|
||||||
re2 (~> 1.1.1)
|
re2 (~> 1.1.1)
|
||||||
recaptcha (~> 4.11)
|
recaptcha (~> 4.11)
|
||||||
redis (~> 3.2)
|
redis (~> 4.0)
|
||||||
redis-namespace (~> 1.6.0)
|
redis-namespace (~> 1.6.0)
|
||||||
redis-rails (~> 5.0.2)
|
redis-rails (~> 5.0.2)
|
||||||
request_store (~> 1.3)
|
request_store (~> 1.3)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Use Rails 5.2 Redis caching store
|
||||||
|
merge_request: 30966
|
||||||
|
author:
|
||||||
|
type: other
|
|
@ -233,7 +233,10 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
# Use caching across all environments
|
# Use caching across all environments
|
||||||
|
# Full list of options:
|
||||||
|
# https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new
|
||||||
caching_config_hash = Gitlab::Redis::Cache.params
|
caching_config_hash = Gitlab::Redis::Cache.params
|
||||||
|
caching_config_hash[:compress] = false
|
||||||
caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
|
caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
|
||||||
caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
|
caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
|
||||||
if Sidekiq.server? # threaded context
|
if Sidekiq.server? # threaded context
|
||||||
|
@ -241,7 +244,7 @@ module Gitlab
|
||||||
caching_config_hash[:pool_timeout] = 1
|
caching_config_hash[:pool_timeout] = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
config.cache_store = :redis_store, caching_config_hash
|
config.cache_store = :redis_cache_store, caching_config_hash
|
||||||
|
|
||||||
config.active_job.queue_adapter = :sidekiq
|
config.active_job.queue_adapter = :sidekiq
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue