Merge branch 'sh-revert-redis-cache-store' into 'master'
Fix "ERR value is not an integer or out of range" errors Closes #66449 See merge request gitlab-org/gitlab-ce!32126
This commit is contained in:
commit
8832aa9522
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix "ERR value is not an integer or out of range" errors
|
||||||
|
merge_request: 32126
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -241,10 +241,7 @@ 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
|
||||||
|
@ -252,7 +249,7 @@ module Gitlab
|
||||||
caching_config_hash[:pool_timeout] = 1
|
caching_config_hash[:pool_timeout] = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
config.cache_store = :redis_cache_store, caching_config_hash
|
config.cache_store = :redis_store, caching_config_hash
|
||||||
|
|
||||||
config.active_job.queue_adapter = :sidekiq
|
config.active_job.queue_adapter = :sidekiq
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue