Merge commit '77bd32a26a' into kb_migration

2023-04-04 17:05:39 +09:00 · 2023-04-04 17:05:39 +09:00 · a726b49476
commit a726b49476
parent 3a088f3c21 77bd32a26a
150 changed files with 3189 additions and 1874 deletions
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@ -35,7 +35,7 @@ REDIS_CACHE_PARAMS = {
  url: ENV['CACHE_REDIS_URL'],
  expires_in: 10.minutes,
  namespace: cache_namespace,
-  pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+  pool_size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
  pool_timeout: 5,
  connect_timeout: 5,
 }.freeze