rails_failover 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 696636b3992c9893a48a23366f760af354c496bbd1573754bdd92b66fc9913ff
-  data.tar.gz: 8994846710a6765afffc3a60845bc696efb53e44d532a04092d3a6ba87adf4d9
+  metadata.gz: 1246e6e2f88b79171c60042aef00f64877c7292c316bd8aa7cb218a7c663c817
+  data.tar.gz: 1ca0033ff058c31d97b29635d7cdcbde05cf4e09a544cde00ca9f6c3b7e0322a
 SHA512:
-  metadata.gz: fe74527339c42947a6205a231f6035af8e039809db86df7d64edb34d02d3cf59fa4f814b05e28f077dd89a61448b5fcde1d70094a5f6c90c81d31cb73d4bd059
-  data.tar.gz: f3a8df28c08ddd305833f1c3ad630c8c3f270bb398aa6698e39b74a413ba03c03614986e3da944e061547d8d70c764b92c90767b2e1bec045a1661cd941563a5
+  metadata.gz: b51f968031ce4b1313f8ae9a299b3e179689bad66121094085955a2fc9d75d24d4a2fcfafbbd6b6783e363a1329ab6747ddd6d9749bf98b327b304940bb13c73
+  data.tar.gz: 77037a16dc321fadb5866cf11a04e220702c1f8e911986da711943c5565b97589d71f21bbf3fb8ca6c8e41d4cd89e090a44fa391b61cc0c10441fe4ba631982f

data/.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: "3.2"
           bundler-cache: true
 
       - name: Rubocop
@@ -29,13 +29,14 @@ jobs:
           bundle exec stree check Gemfile rails_failover.gemspec $(git ls-files '*.rb')
 
   redis:
-    name: 'Redis (Ruby ${{ matrix.ruby }})'
+    name: "Redis (Redis gem ~> ${{ matrix.redis_gem }}, Ruby ${{ matrix.ruby }})"
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.4', '3.3', '3.2', '3.1']
+        ruby: ["3.4", "3.3", "3.2", "3.1"]
+        redis_gem: ["4.8", "5.3"]
 
     steps:
       - uses: actions/checkout@v3
@@ -44,31 +45,37 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+
+      - name: Setup gems
+        env:
+          REDIS_GEM_VERSION: ${{ matrix.redis_gem }}
+        run: bundle install
 
       - name: Setup redis
         run: sudo apt-get install redis-server
 
       - name: Redis specs
+        env:
+          REDIS_GEM_VERSION: ${{ matrix.redis_gem }}
         run: bin/rspec redis
 
   active_record:
     runs-on: ubuntu-latest
-    name: 'ActiveRecord ~>${{ matrix.rails }} (Ruby ${{ matrix.ruby }})'
+    name: "ActiveRecord ~>${{ matrix.rails }} (Ruby ${{ matrix.ruby }})"
 
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.4', '3.3', '3.2', '3.1']
-        rails: ['7.1.0', '7.0.0']
+        ruby: ["3.4", "3.3", "3.2", "3.1"]
+        rails: ["7.1.0", "7.0.0"]
         include:
-          - ruby: '3.2'
-            rails: '6.1.0'
+          - ruby: "3.2"
+            rails: "6.1.0"
         exclude:
-          - ruby: '3.4'
-            rails: '7.0.0'
-          - ruby: '3.3'
-            rails: '7.0.0'
+          - ruby: "3.4"
+            rails: "7.0.0"
+          - ruby: "3.3"
+            rails: "7.0.0"
 
     steps:
       - uses: actions/checkout@v3
@@ -84,13 +91,20 @@ jobs:
       - name: Setup postgres
         run: |
           make setup_pg
-          make start_pg
 
       - name: ActiveRecord specs
         env:
           RAILS_VERSION: ${{ matrix.rails }}
         run: bin/rspec active_record
 
+      - name: Dump Unicorn STDERR logs
+        if: ${{ failure() }}
+        run: cat spec/support/dummy_app/log/unicorn.stderr.log
+
+      - name: Dump Rails logs
+        if: ${{ failure() }}
+        run: cat spec/support/dummy_app/log/production.log
+
   publish:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: [lint, redis, active_record]

data/.gitignore

@@ -16,4 +16,5 @@
 *.rdb
 
 *.gem
-Gemfile.lock
+**/Gemfile.lock
+/Gemfile.lock

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --require spec_helper
 --format documentation
+--order random

data/CHANGELOG.md

@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.0] - 2025-01-29
+
+- DEV: Add compatibility with the Redis gem version 5.x
+
+## [2.1.1] - 2024-07-02
+
+- FIX: Falling back to primary PG server not reliable on Rails 7.1
+
 ## [2.1.0] - 2024-05-29
+
 - DEV: Update dependencies to officially support Rails 7.1
 
 ## [2.0.1] - 2023-05-30

data/Gemfile

@@ -3,3 +3,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in rails_failover.gemspec
 gemspec
+
+gem "redis", "~> #{ENV["REDIS_GEM_VERSION"] || "5.3"}"

data/README.md

@@ -79,7 +79,25 @@ connects_to database: { writing: :primary, second_database_writing: :second_data
 Add `require 'rails_failover/redis'` before creating a `Redis` instance.
 
 ```ruby
-Redis.new(host: "127.0.0.1", port: 6379, replica_host: "127.0.0.1", replica_port: 6380, connector: RailsFailover::Redis::Connector)
+# Redis/RedisClient 4.x
+Redis.new(
+  host: "127.0.0.1",
+  port: 6379,
+  replica_host: "127.0.0.1",
+  replica_port: 6380,
+  connector: RailsFailover::Redis::Connector,
+)
+
+# Redis/RedisClient 5.x
+Redis.new(
+  host: "127.0.0.1",
+  port: 6379,
+  client_implementation: RailsFailover::Redis::Client,
+  custom: {
+    replica_host: "127.0.0.1",
+    replica_port: 6380,
+  }
+)
 ```
 
 Callbacks can be registered when the primary connection is down and when it is up.
@@ -94,6 +112,8 @@ RailsFailover::Redis.on_fallback_callback do
 end
 ```
 
+> ⚠️ If you’re using Sidekiq, don’t provide it with the replica configuration as it won’t work. RailsFailover works with a replica in read-only mode, meaning Sidekiq wouldn’t work properly anyway as it needs to write to Redis.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -107,7 +127,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 The ActiveRecord failover tests are run against a dummy Rails server. Run the following commands to run the test:
 
 1. `make setup_pg`
-2. `make start_pg`
 3. `bin/rspec active_record`. You may also run the tests with more unicorn workers by adding the `UNICORN_WORKERS` env variable.
 
 #### Redis

data/lib/rails_failover/active_record/handler.rb

@@ -60,10 +60,11 @@ module RailsFailover
 
           begin
             connection =
-              ::ActiveRecord::Base.connection_handler.retrieve_connection(
-                spec_name,
-                role: handler_key,
-              )
+              ::ActiveRecord::Base
+                .connection_handler
+                .retrieve_connection(spec_name, role: handler_key)
+                .tap(&:verify!)
+
             connection_active = connection.active?
           rescue => e
             logger.debug "#{Process.pid} Connection to server for '#{handler_key} #{spec_name}' failed with '#{e.message}'"

data/lib/rails_failover/active_record/railtie.rb

@@ -11,7 +11,7 @@ module RailsFailover
         app.config.active_record_rails_failover = true
         ::ActiveSupport.on_load(:active_record) do
           begin
-            ::ActiveRecord::Base.connection
+            ::ActiveRecord::Base.connection.verify!
           rescue ::ActiveRecord::NoDatabaseError
             # Do nothing since database hasn't been created
           rescue ::PG::Error, ::ActiveRecord::ConnectionNotEstablished

data/lib/rails_failover/redis/{connector.rb → compat_4x/connector.rb}

@@ -9,6 +9,7 @@ module RailsFailover
         original_driver = options[:driver]
         options[:primary_host] = options[:host]
         options[:primary_port] = options[:port]
+        options[:id] ||= "#{options[:host]}:#{options[:port]}"
 
         options[:driver] = Class.new(options[:driver]) do
           def self.connect(options)
@@ -40,25 +41,24 @@ module RailsFailover
 
         options[:original_driver] = original_driver
         options.delete(:connector)
-        options[:id] ||= "#{options[:host]}:#{options[:port]}"
         @replica_options = replica_options(options)
         @options = options.dup
       end
 
       def resolve
-        Handler.instance.primary_down?(@options) ? @replica_options : @options
+        Handler.instance.primary_down?(@options[:id]) ? @replica_options : @options
       end
 
       def check(client)
-        Handler.instance.register_client(client)
-        expected_role = Handler.instance.primary_down?(@options) ? REPLICA : PRIMARY
+        Handler.instance.register_client(client, client.options[:id])
+        expected_role = Handler.instance.primary_down?(@options[:id]) ? REPLICA : PRIMARY
         if client.connection.rails_failover_role != expected_role
           raise ::Redis::CannotConnectError, "Opened with unexpected failover role"
         end
       end
 
       def on_disconnect(client)
-        Handler.instance.deregister_client(client)
+        Handler.instance.deregister_client(client, client.options[:id])
       end
 
       private

data/lib/rails_failover/redis/compat_4x/handler.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "../handler_base"
+
+module RailsFailover
+  class Redis
+    class Handler < HandlerBase
+      def new_primary_client(options)
+        options[:driver] = options[:original_driver]
+        ::Redis::Client.new(options)
+      end
+
+      def primary_client_info(client)
+        client.call([:info])
+      end
+
+      def soft_disconnect_original_client(matched_clients, redis, role)
+        # When subscribed, Redis#_client is not a Redis::Client
+        # Instance variable is the only reliable way
+        client = redis.instance_variable_get(:@original_client)
+        return if !matched_clients.include?(client)
+        soft_disconnect(redis, client, role)
+      end
+    end
+  end
+end

data/lib/{redis → rails_failover/redis/compat_4x}/patches/client.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require "redis"
+require "active_support/core_ext/module/delegation"
 
 # See https://github.com/redis/redis-rb/pull/908
 class Redis::Client
+  delegate :rails_failover_role, :shutdown_socket, to: :connection, allow_nil: true
+
   def disconnect
     if connected?
       result = connection.disconnect

data/lib/rails_failover/redis/compat_5x/client.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RailsFailover
+  class Redis
+    class Client < ::Redis::Client
+      def initialize(config, **kwargs)
+        super
+        @config = RailsFailover::Redis::Config.new(config)
+      end
+
+      def connect
+        Handler.instance.register_client(self, id)
+        super
+      end
+
+      def on_disconnect
+        Handler.instance.deregister_client(self, id)
+      end
+    end
+  end
+end

data/lib/rails_failover/redis/compat_5x/config.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "delegate"
+require_relative "handler"
+
+module RailsFailover
+  class Redis
+    class Config < SimpleDelegator
+      attr_reader :driver, :primary_host, :primary_port, :id
+      attr_accessor :rails_failover_role
+
+      def initialize(object)
+        super
+        @primary_host = object.host
+        @primary_port = object.port
+        @id ||= "#{object.host}:#{object.port}"
+        @driver =
+          Class.new(object.driver) do
+            def connect
+              is_primary =
+                (config.host == config.primary_host) && (config.port == config.primary_port)
+              super.tap { config.rails_failover_role = is_primary ? PRIMARY : REPLICA }
+            rescue ::Redis::TimeoutError,
+                   RedisClient::CannotConnectError,
+                   SocketError,
+                   Errno::EADDRNOTAVAIL,
+                   Errno::ECONNREFUSED,
+                   Errno::EHOSTDOWN,
+                   Errno::EHOSTUNREACH,
+                   Errno::ENETUNREACH,
+                   Errno::ENOENT,
+                   Errno::ETIMEDOUT,
+                   Errno::EINVAL => e
+              Handler.instance.verify_primary(config) if is_primary
+              raise e
+            end
+          end
+      end
+
+      def host
+        return super unless Handler.instance.primary_down?(id)
+        custom[:replica_host]
+      end
+
+      def port
+        return super unless Handler.instance.primary_down?(id)
+        custom[:replica_port]
+      end
+
+      def new_primary_client
+        ::Redis::Client.new(__getobj__)
+      end
+
+      def [](key)
+        instance_variable_get("@#{key}")
+      end
+    end
+  end
+end

data/lib/rails_failover/redis/compat_5x/handler.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "../handler_base"
+
+module RailsFailover
+  class Redis
+    class Handler < HandlerBase
+      def new_primary_client(config)
+        config.new_primary_client
+      end
+
+      def primary_client_info(client)
+        client.call_v([:info])
+      end
+
+      def soft_disconnect_original_client(matched_clients, redis, role)
+        return if !matched_clients.include?(redis._client)
+        soft_disconnect(redis, redis._client, role)
+      end
+    end
+  end
+end

data/lib/rails_failover/redis/compat_5x/patches/client.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "redis"
+require "active_support/core_ext/module/delegation"
+
+class Redis::Client
+  delegate :rails_failover_role, to: :config, allow_nil: true
+
+  alias shutdown_socket close
+
+  def disconnect
+    close
+    on_disconnect
+    self
+  end
+
+  def on_disconnect
+  end
+end
+
+class Redis::SubscribedClient
+  delegate :connected?, to: :@client
+end
+
+class RedisClient::PubSub
+  delegate :connected?, to: :@raw_connection, allow_nil: true
+end

data/lib/rails_failover/redis/{handler.rb → handler_base.rb}

@@ -6,7 +6,7 @@ require "concurrent"
 
 module RailsFailover
   class Redis
-    class Handler
+    class HandlerBase
       include Singleton
       include MonitorMixin
 
@@ -23,8 +23,8 @@ module RailsFailover
         super() # Monitor#initialize
       end
 
-      def verify_primary(options)
-        primary_down(options)
+      def verify_primary(config)
+        primary_down(config)
 
         mon_synchronize do
           return if @thread&.alive?
@@ -33,18 +33,16 @@ module RailsFailover
         end
       end
 
-      def register_client(client)
-        id = client.options[:id]
+      def register_client(client, id)
         clients_for_id(id).put_if_absent(client, true)
       end
 
-      def deregister_client(client)
-        id = client.options[:id]
+      def deregister_client(client, id)
         clients_for_id(id).delete(client)
       end
 
-      def primary_down?(options)
-        primaries_down[options[:id]]
+      def primary_down?(id)
+        primaries_down[id]
       end
 
       def primaries_down_count
@@ -71,15 +69,14 @@ module RailsFailover
 
         active_primaries_keys = {}
 
-        primaries_down.each do |key, options|
+        primaries_down.each do |key, config|
           info = nil
-          options = options.dup
+          config = config.dup
 
           begin
-            options[:driver] = options[:original_driver]
-            primary_client = ::Redis::Client.new(options)
+            primary_client = new_primary_client(config)
             logger&.debug "Checking connection to primary server (#{key})"
-            info = primary_client.call([:info])
+            info = primary_client_info(primary_client)
           rescue => e
             logger&.debug "Connection to primary server (#{key}) failed with '#{e.message}'"
           ensure
@@ -87,14 +84,14 @@ module RailsFailover
           end
 
           if info && info.include?(PRIMARY_LOADED_STATUS) && info.include?(PRIMARY_ROLE_STATUS)
-            active_primaries_keys[key] = options
+            active_primaries_keys[key] = config
             logger&.debug "Primary server (#{key}) is active, disconnecting clients from replica"
           end
         end
 
-        active_primaries_keys.each do |key, options|
-          primary_up(options)
-          disconnect_clients(options, RailsFailover::Redis::REPLICA)
+        active_primaries_keys.each do |key, config|
+          primary_up(config)
+          disconnect_clients(config[:id], RailsFailover::Redis::REPLICA)
         end
       end
 
@@ -102,14 +99,14 @@ module RailsFailover
         primaries_down.empty?
       end
 
-      def primary_up(options)
-        already_up = !primaries_down.delete(options[:id])
-        RailsFailover::Redis.on_fallback_callback!(options[:id]) if !already_up
+      def primary_up(config)
+        already_up = !primaries_down.delete(config[:id])
+        RailsFailover::Redis.on_fallback_callback!(config[:id]) if !already_up
       end
 
-      def primary_down(options)
-        already_down = primaries_down.put_if_absent(options[:id], options.dup)
-        RailsFailover::Redis.on_failover_callback!(options[:id]) if !already_down
+      def primary_down(config)
+        already_down = primaries_down.put_if_absent(config[:id], config.dup)
+        RailsFailover::Redis.on_failover_callback!(config[:id]) if !already_down
       end
 
       def primaries_down
@@ -121,7 +118,7 @@ module RailsFailover
           end
 
         ancestor_pids&.each do |pid|
-          @primaries_down.delete(pid)&.each { |id, options| verify_primary(options) }
+          @primaries_down.delete(pid)&.each { |id, config| verify_primary(config) }
         end
 
         value
@@ -143,27 +140,21 @@ module RailsFailover
       end
 
       def ensure_primary_clients_disconnected
-        primaries_down.each do |key, options|
-          disconnect_clients(options, RailsFailover::Redis::PRIMARY)
+        primaries_down.each do |key, config|
+          disconnect_clients(config[:id], RailsFailover::Redis::PRIMARY)
         end
       end
 
-      def disconnect_clients(options, role)
-        id = options[:id]
-
+      def disconnect_clients(id, role)
         matched_clients =
-          clients_for_id(id)&.keys&.filter { |c| c.connection.rails_failover_role == role }&.to_set
+          clients_for_id(id)&.keys&.select { _1.rails_failover_role == role }&.to_set
 
         return if matched_clients.nil? || matched_clients.empty?
 
         # This is not ideal, but the mutex we need is contained
         # in the ::Redis instance, not the Redis::Client
         ObjectSpace.each_object(::Redis) do |redis|
-          # When subscribed, Redis#_client is not a Redis::Client
-          # Instance variable is the only reliable way
-          client = redis.instance_variable_get(:@original_client)
-          next if !matched_clients.include?(client)
-          soft_disconnect(redis, client, role)
+          soft_disconnect_original_client(matched_clients, redis, role)
         end
       end
 
@@ -174,7 +165,7 @@ module RailsFailover
 
         if !has_lock
           begin
-            client.connection.shutdown_socket
+            client.shutdown_socket
           rescue => e
             logger&.warn "Redis shutdown_socket for (#{role}) failed with #{e.class} '#{e.message}'"
           end
@@ -182,15 +173,14 @@ module RailsFailover
           waiting_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           loop do # Keep trying
             break if has_lock = redis_mon_try_enter(redis)
-            break if !client.connection.connected? # Disconnected by other thread
-            break if client.connection.rails_failover_role != role # Reconnected by other thread
+            break if !client.connected? # Disconnected by other thread
+            break if client.rails_failover_role != role # Reconnected by other thread
             time_now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             break if time_now > waiting_since + SOFT_DISCONNECT_TIMEOUT_SECONDS
             sleep SOFT_DISCONNECT_POLL_SECONDS
           end
         end
-
-        client.disconnect if client.connection&.rails_failover_role == role
+        client.disconnect if client.rails_failover_role == role
       ensure
         redis_mon_exit(redis) if has_lock
       end

data/lib/rails_failover/redis.rb

@@ -8,8 +8,14 @@ if Gem::Version.new(Redis::VERSION) < Gem::Version.new(supported_version)
   raise "redis #{Redis::VERSION} is not supported. Please upgrade to Redis #{supported_version}."
 end
 
-require_relative "../redis/patches/client"
-require_relative "redis/connector"
+if Redis::VERSION >= "5"
+  require_relative "redis/compat_5x/patches/client"
+  require_relative "redis/compat_5x/config"
+  require_relative "redis/compat_5x/client"
+else
+  require_relative "redis/compat_4x/patches/client"
+  require_relative "redis/compat_4x/connector"
+end
 
 module RailsFailover
   class Redis

data/lib/rails_failover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsFailover
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/makefile

@@ -3,19 +3,8 @@ include redis.mk
 
 all: redis
 
-active_record: teardown_dummy_rails_server setup_dummy_rails_server test_active_record
+active_record: start_pg_primary create_test_database stop_pg test_active_record
 
 test_active_record:
+	@BUNDLE_GEMFILE=./spec/support/dummy_app/Gemfile bundle install --quiet
 	@ACTIVE_RECORD=1 bundle exec rspec --tag type:active_record ${RSPEC_PATH}
-
-setup_dummy_rails_server:
-	@cd spec/support/dummy_app && BUNDLE_GEMFILE=Gemfile bundle install --quiet && BUNDLE_GEMFILE=Gemfile RAILS_ENV=production $(BUNDLER_BIN) exec rails db:create db:migrate db:seed
-
-start_dummy_rails_server:
-	@cd spec/support/dummy_app && BUNDLE_GEMFILE=Gemfile SECRET_KEY_BASE=somekey bundle exec unicorn -c config/unicorn.conf.rb -D -E production
-
-stop_dummy_rails_server:
-	@kill -TERM $(shell cat spec/support/dummy_app/tmp/pids/unicorn.pid)
-
-teardown_dummy_rails_server:
-	@cd spec/support/dummy_app && (! (bundle check > /dev/null 2>&1) || BUNDLE_GEMFILE=Gemfile DISABLE_DATABASE_ENVIRONMENT_CHECK=1 RAILS_ENV=production $(BUNDLER_BIN) exec rails db:drop)

data/postgresql.mk

@@ -1,9 +1,9 @@
 PG_BIN_DIR               := $(shell pg_config --bindir)
 PWD                      := $(shell pwd)
-PG_PRIMARY_DIR           := $(PWD)/tmp/primary
+PG_PRIMARY_DIR           := /tmp/primary
 PG_PRIMARY_DATA_DIR      := $(PG_PRIMARY_DIR)/data
 PG_PRIMARY_RUN_DIR       := $(PG_PRIMARY_DIR)/run
-PG_REPLICA_DIR           := $(PWD)/tmp/replica
+PG_REPLICA_DIR           := /tmp/replica
 PG_REPLICA_DATA_DIR      := $(PG_REPLICA_DIR)/data
 PG_REPLICA_RUN_DIR       := $(PG_REPLICA_DIR)/run
 PG_PRIMARY_PORT          := 5434
@@ -14,11 +14,14 @@ PG_REPLICATION_SLOT_NAME := replication
 
 setup_pg: init_primary start_pg_primary setup_primary init_replica stop_pg_primary
 
+create_test_database:
+	@$(PG_BIN_DIR)/psql -p $(PG_PRIMARY_PORT) -h $(PG_PRIMARY_RUN_DIR) -d postgres --quiet -c "DROP DATABASE IF EXISTS test;"
+	@$(PG_BIN_DIR)/psql -p $(PG_PRIMARY_PORT) -h $(PG_PRIMARY_RUN_DIR) -d postgres --quiet -c "CREATE DATABASE test;"
+
 setup_primary:
 	@$(PG_BIN_DIR)/psql -p $(PG_PRIMARY_PORT) -h $(PG_PRIMARY_RUN_DIR) -d postgres -c "CREATE USER $(PG_REPLICATION_USER) WITH REPLICATION ENCRYPTED PASSWORD '$(PG_REPLICATION_PASSWORD)';"
 	@$(PG_BIN_DIR)/psql -p $(PG_PRIMARY_PORT) -h $(PG_PRIMARY_RUN_DIR) -d postgres -c "SELECT * FROM pg_create_physical_replication_slot('$(PG_REPLICATION_SLOT_NAME)');"
 	@$(PG_BIN_DIR)/psql -p $(PG_PRIMARY_PORT) -h $(PG_PRIMARY_RUN_DIR) -d postgres -c "CREATE USER test;"
-	@$(PG_BIN_DIR)/psql -p $(PG_PRIMARY_PORT) -h $(PG_PRIMARY_RUN_DIR) -d postgres -c "CREATE DATABASE test;"
 
 start_pg: start_pg_primary start_pg_replica
 
@@ -36,19 +39,36 @@ init_replica:
 	@chmod 0700 $(PG_REPLICA_DATA_DIR)
 
 start_pg_primary:
-	@$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_PRIMARY_DATA_DIR) -o "-p $(PG_PRIMARY_PORT)" -o "-k $(PG_PRIMARY_RUN_DIR)" start
+	@if [ ! -d "$(PG_PRIMARY_DATA_DIR)" ] || ! $(PG_BIN_DIR)/pg_ctl status -D $(PG_PRIMARY_DATA_DIR) > /dev/null 2>&1; then \
+		$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_PRIMARY_DATA_DIR) -o "-p $(PG_PRIMARY_PORT)" -o "-k $(PG_PRIMARY_RUN_DIR)" start; \
+		while ! $(PG_BIN_DIR)/pg_ctl status -D $(PG_PRIMARY_DATA_DIR) > /dev/null 2>&1; do \
+			sleep 1; \
+		done; \
+	fi
 
 start_pg_replica:
-	@$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_REPLICA_DATA_DIR) -o "-p $(PG_REPLICA_PORT)" -o "-k $(PG_REPLICA_RUN_DIR)" start
-
-restart_pg_primary:
-	@$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_PRIMARY_DATA_DIR) -o "-p $(PG_PRIMARY_PORT)" -o "-k $(PG_PRIMARY_RUN_DIR)" restart
+	@if [ ! -d "$(PG_REPLICA_DATA_DIR)" ] || ! $(PG_BIN_DIR)/pg_ctl status -D $(PG_REPLICA_DATA_DIR) > /dev/null 2>&1; then \
+		$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_REPLICA_DATA_DIR) -o "-p $(PG_REPLICA_PORT)" -o "-k $(PG_REPLICA_RUN_DIR)" start; \
+		while ! $(PG_BIN_DIR)/pg_ctl status -D $(PG_REPLICA_DATA_DIR) > /dev/null 2>&1; do \
+			sleep 1; \
+		done; \
+	fi
 
 stop_pg_primary:
-	@$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_PRIMARY_DATA_DIR) -o "-p $(PG_PRIMARY_PORT)" -o "-k $(PG_PRIMARY_RUN_DIR)" stop
+	@if [ -d "$(PG_PRIMARY_DATA_DIR)" ] && $(PG_BIN_DIR)/pg_ctl status -D $(PG_PRIMARY_DATA_DIR) > /dev/null 2>&1; then \
+		$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_PRIMARY_DATA_DIR) -o "-p $(PG_PRIMARY_PORT)" -o "-k $(PG_PRIMARY_RUN_DIR)" stop; \
+		while $(PG_BIN_DIR)/pg_ctl status -D $(PG_PRIMARY_DATA_DIR) > /dev/null 2>&1; do \
+			sleep 1; \
+		done; \
+	fi
 
 stop_pg_replica:
-	@$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_REPLICA_DATA_DIR) -o "-p $(PG_REPLICA_PORT)" -o "-k $(PG_REPLICA_RUN_DIR)" stop
+	@if [ -d "$(PG_REPLICA_DATA_DIR)" ] && $(PG_BIN_DIR)/pg_ctl status -D $(PG_REPLICA_DATA_DIR) > /dev/null 2>&1; then \
+		$(PG_BIN_DIR)/pg_ctl --silent --log /dev/null -w -D $(PG_REPLICA_DATA_DIR) -o "-p $(PG_REPLICA_PORT)" -o "-k $(PG_REPLICA_RUN_DIR)" stop; \
+		while $(PG_BIN_DIR)/pg_ctl status -D $(PG_REPLICA_DATA_DIR) > /dev/null 2>&1; do \
+			sleep 1; \
+		done; \
+	fi
 
 cleanup_pg:
 	@rm -rf $(PG_PRIMARY_DIR) $(PG_REPLICA_DIR)

data/rails_failover.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", ">= 6.1", "< 8.0"
   spec.add_dependency "concurrent-ruby"
 
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "redis", "~> 4.1"
-  spec.add_development_dependency "pg", "~> 1.2"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "redis", ">= 4.1", "< 6.0"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "rack"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rubocop-discourse"
   spec.add_development_dependency "syntax_tree"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Alan Tan
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -68,44 +67,50 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -124,16 +129,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +195,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - tgx@discourse.org
 executables: []
@@ -217,10 +221,15 @@ files:
 - lib/rails_failover/active_record/middleware.rb
 - lib/rails_failover/active_record/railtie.rb
 - lib/rails_failover/redis.rb
-- lib/rails_failover/redis/connector.rb
-- lib/rails_failover/redis/handler.rb
+- lib/rails_failover/redis/compat_4x/connector.rb
+- lib/rails_failover/redis/compat_4x/handler.rb
+- lib/rails_failover/redis/compat_4x/patches/client.rb
+- lib/rails_failover/redis/compat_5x/client.rb
+- lib/rails_failover/redis/compat_5x/config.rb
+- lib/rails_failover/redis/compat_5x/handler.rb
+- lib/rails_failover/redis/compat_5x/patches/client.rb
+- lib/rails_failover/redis/handler_base.rb
 - lib/rails_failover/version.rb
-- lib/redis/patches/client.rb
 - makefile
 - postgresql.mk
 - rails_failover.gemspec
@@ -229,7 +238,6 @@ homepage: https://github.com/discourse/rails_failover
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -244,8 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Failover for ActiveRecord and Redis
 test_files: []