diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-22 22:51:39 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-23 10:08:46 +0000 |
| commit | a81d63d56adaed78b5c9c6f06461ef1b0e5a6eb2 (patch) | |
| tree | 482ce3fc8e1cb04d28243b2614836df4174c6df8 | |
| parent | 8d6156cd60589ffe8baa1df4dab4b61a40949114 (diff) | |
| download | gitlab-ce-a81d63d56adaed78b5c9c6f06461ef1b0e5a6eb2.tar.gz | |
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
(cherry picked from commit 8832aa9522476d9d244211856f4ac7fe545a0c97)
6bda359b Fix "ERR value is not an integer or out of range" errors
| -rw-r--r-- | changelogs/unreleased/sh-revert-redis-cache-store.yml | 5 | ||||
| -rw-r--r-- | config/application.rb | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/changelogs/unreleased/sh-revert-redis-cache-store.yml b/changelogs/unreleased/sh-revert-redis-cache-store.yml new file mode 100644 index 00000000000..710b6e7941d --- /dev/null +++ b/changelogs/unreleased/sh-revert-redis-cache-store.yml @@ -0,0 +1,5 @@ +--- +title: Fix "ERR value is not an integer or out of range" errors +merge_request: 32126 +author: +type: fixed diff --git a/config/application.rb b/config/application.rb index 2554dd8cca2..294ed470298 100644 --- a/config/application.rb +++ b/config/application.rb @@ -241,10 +241,7 @@ module Gitlab end # 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[:compress] = false caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever if Sidekiq.server? # threaded context @@ -252,7 +249,7 @@ module Gitlab caching_config_hash[:pool_timeout] = 1 end - config.cache_store = :redis_cache_store, caching_config_hash + config.cache_store = :redis_store, caching_config_hash config.active_job.queue_adapter = :sidekiq |