Refactor (ruby) redis configuration (#31694)

lib/chewy/strategy/mastodon.rb

@@ -14,7 +14,7 @@ module Chewy
       end
 
       def leave
-        RedisConfiguration.with do |redis|
+        RedisConnection.with do |redis|
           redis.pipelined do |pipeline|
             @stash.each do |type, ids|
               pipeline.sadd("chewy:queue:#{type.name}", ids)

lib/mastodon/cli/base.rb

@@ -40,7 +40,7 @@ module Mastodon
             .dup
             .tap { |config| config['pool'] = options[:concurrency] + 1 }
         )
-        RedisConfiguration.establish_pool(options[:concurrency])
+        RedisConnection.establish_pool(options[:concurrency])
       end
     end
   end

lib/mastodon/cli/progress_helper.rb

@@ -51,7 +51,7 @@ module Mastodon::CLI
               result = ActiveRecord::Base.connection_pool.with_connection do
                 yield(item)
               ensure
-                RedisConfiguration.pool.checkin if Thread.current[:redis]
+                RedisConnection.pool.checkin if Thread.current[:redis]
                 Thread.current[:redis] = nil
               end
 

lib/mastodon/rack_middleware.rb

@@ -19,7 +19,7 @@ class Mastodon::RackMiddleware
   end
 
   def clean_up_redis_socket!
-    RedisConfiguration.pool.checkin if Thread.current[:redis]
+    RedisConnection.pool.checkin if Thread.current[:redis]
     Thread.current[:redis] = nil
   end
 

lib/mastodon/redis_config.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-def setup_redis_env_url(prefix = nil, defaults = true)
-  prefix = "#{prefix.to_s.upcase}_" unless prefix.nil?
-  prefix = '' if prefix.nil?
-
-  return if ENV["#{prefix}REDIS_URL"].present?
-
-  password = ENV.fetch("#{prefix}REDIS_PASSWORD") { '' if defaults }
-  host     = ENV.fetch("#{prefix}REDIS_HOST") { 'localhost' if defaults }
-  port     = ENV.fetch("#{prefix}REDIS_PORT") { 6379 if defaults }
-  db       = ENV.fetch("#{prefix}REDIS_DB") { 0 if defaults }
-
-  ENV["#{prefix}REDIS_URL"] = begin
-    if [password, host, port, db].all?(&:nil?)
-      ENV['REDIS_URL']
-    else
-      Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
-        uri.password = password if password.present?
-      end.normalize.to_str
-    end
-  end
-end
-
-setup_redis_env_url
-setup_redis_env_url(:cache, false)
-setup_redis_env_url(:sidekiq, false)
-
-namespace         = ENV.fetch('REDIS_NAMESPACE', nil)
-cache_namespace   = namespace ? "#{namespace}_cache" : 'cache'
-sidekiq_namespace = namespace
-
-redis_driver = ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
-
-REDIS_CACHE_PARAMS = {
-  driver: redis_driver,
-  url: ENV['CACHE_REDIS_URL'],
-  expires_in: 10.minutes,
-  namespace: "#{cache_namespace}:7.1",
-  connect_timeout: 5,
-  pool: {
-    size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
-    timeout: 5,
-  },
-}.freeze
-
-REDIS_SIDEKIQ_PARAMS = {
-  driver: redis_driver,
-  url: ENV['SIDEKIQ_REDIS_URL'],
-  namespace: sidekiq_namespace,
-}.freeze
-
-ENV['REDIS_NAMESPACE'] = "mastodon_test#{ENV['TEST_ENV_NUMBER']}" if Rails.env.test?

lib/mastodon/redis_configuration.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+class Mastodon::RedisConfiguration
+  def base
+    @base ||= {
+      url: setup_base_redis_url,
+      driver: driver,
+      namespace: base_namespace,
+    }
+  end
+
+  def sidekiq
+    @sidekiq ||= {
+      url: setup_prefixed_redis_url(:sidekiq),
+      driver: driver,
+      namespace: sidekiq_namespace,
+    }
+  end
+
+  def cache
+    @cache ||= {
+      url: setup_prefixed_redis_url(:cache),
+      driver: driver,
+      namespace: cache_namespace,
+      expires_in: 10.minutes,
+      connect_timeout: 5,
+      pool: {
+        size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+        timeout: 5,
+      },
+    }
+  end
+
+  private
+
+  def driver
+    ENV['REDIS_DRIVER'] == 'ruby' ? :ruby : :hiredis
+  end
+
+  def namespace
+    @namespace ||= ENV.fetch('REDIS_NAMESPACE', nil)
+  end
+
+  def base_namespace
+    return "mastodon_test#{ENV.fetch('TEST_ENV_NUMBER', nil)}" if Rails.env.test?
+
+    namespace
+  end
+
+  def sidekiq_namespace
+    namespace
+  end
+
+  def cache_namespace
+    namespace ? "#{namespace}_cache" : 'cache'
+  end
+
+  def setup_base_redis_url
+    url = ENV.fetch('REDIS_URL', nil)
+    return url if url.present?
+
+    user     = ENV.fetch('REDIS_USER', '')
+    password = ENV.fetch('REDIS_PASSWORD', '')
+    host     = ENV.fetch('REDIS_HOST', 'localhost')
+    port     = ENV.fetch('REDIS_PORT', 6379)
+    db       = ENV.fetch('REDIS_DB', 0)
+
+    construct_uri(host, port, db, user, password)
+  end
+
+  def setup_prefixed_redis_url(prefix)
+    prefix = "#{prefix.to_s.upcase}_"
+    url = ENV.fetch("#{prefix}REDIS_URL", nil)
+
+    return url if url.present?
+
+    user     = ENV.fetch("#{prefix}REDIS_USER", nil)
+    password = ENV.fetch("#{prefix}REDIS_PASSWORD", nil)
+    host     = ENV.fetch("#{prefix}REDIS_HOST", nil)
+    port     = ENV.fetch("#{prefix}REDIS_PORT", nil)
+    db       = ENV.fetch("#{prefix}REDIS_DB", nil)
+
+    if host.nil?
+      base[:url]
+    else
+      construct_uri(host, port, db, user, password)
+    end
+  end
+
+  def construct_uri(host, port, db, user, password)
+    Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
+      uri.user = user if user.present?
+      uri.password = password if password.present?
+    end.normalize.to_str
+  end
+end

lib/mastodon/sidekiq_middleware.rb

@@ -53,7 +53,7 @@ class Mastodon::SidekiqMiddleware
   end
 
   def clean_up_redis_socket!
-    RedisConfiguration.pool.checkin if Thread.current[:redis]
+    RedisConnection.pool.checkin if Thread.current[:redis]
     Thread.current[:redis] = nil
   end