From d587a268fdcee4ab8795fe4f03dff683e668ae15 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 27 Nov 2022 20:37:37 +0100
Subject: [PATCH] Add logging for Rails cache timeouts (#21667)

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

* Log cache store errors
---
 config/initializers/cache_logging.rb | 3 +++
 lib/mastodon/redis_config.rb         | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 config/initializers/cache_logging.rb

diff --git a/config/initializers/cache_logging.rb b/config/initializers/cache_logging.rb
new file mode 100644
index 000000000..08aa80742
--- /dev/null
+++ b/config/initializers/cache_logging.rb
@@ -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
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index 98dc4788d..3522fa11e 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -37,6 +37,7 @@ REDIS_CACHE_PARAMS = {
   namespace: cache_namespace,
   pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
   pool_timeout: 5,
+  connect_timeout: 5,
 }.freeze
 
 REDIS_SIDEKIQ_PARAMS = {