potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add logging for Rails cache timeouts (#21667)

Browse source 
* Reduce redis cache store connect timeout from default 20 seconds to 5 seconds

* Log cache store errors
This commit is contained in:
Claire 2022-11-27 20:37:37 +01:00 committed by GitHub
parent 14e2354eea
commit d587a268fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/initializers/cache_logging.rb Normal file
View file

@ -0,0 +1,3 @@
# Log cache errors with Rail's logger
# This used to be the default in old Rails versions: https://github.com/rails/rails/commit/7fcf8590e788cef8b64cc266f75931c418902ca9#diff-f0748f0be8a653eea13369ebb1cadabcad71ede7cfaf20282447e64329817befL86
Rails.cache.logger = Rails.logger

1
lib/mastodon/redis_config.rb
View file

@ -37,6 +37,7 @@ REDIS_CACHE_PARAMS = {
namespace: cache_namespace, namespace: cache_namespace,
pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5), pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
pool_timeout: 5, pool_timeout: 5,
connect_timeout: 5,
}.freeze }.freeze
REDIS_SIDEKIQ_PARAMS = { REDIS_SIDEKIQ_PARAMS = {