rails_failover 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b47ce7eef70576e83fe137949d50e280677f6f5e2444790a9bdf7cc1708f540
-  data.tar.gz: eea78a86a311a24926c83ab4450eae6ed59b0f39a60faafdf9affe050074aa7d
+  metadata.gz: 307117d6a7083a17a2bf2799737f6f9be3afa77a58bace4f867bedf38fa05a5c
+  data.tar.gz: 9d9d54a7a46785f259ba3f19aad402534de7b5305bd57993cb9c92fd14efad3b
 SHA512:
-  metadata.gz: 46aea75592369b8a0af7a48ee1898d2fdfecb8a80ebc777ba386052709678258d719a7e2e2d4d00f1c6c3ca7d158747eecb0a329373ff3a8f6423c6f70824f27
-  data.tar.gz: aa006f95128b6ec9fe600652c62d20c32b948aeff049cf2155d5366b97a57d851631e8de6c128f2f0587c0e4d97a797252b5c2f196a98d7d245e3b0a539d8b53
+  metadata.gz: 7c45a722a9d8bbe1d0ea1410630252c5485496a49b6affe5461615779102d25bfafbf0d990bce920d8e52f164ebe1b92e94a1ccd1787d526b98cba54fc039d45
+  data.tar.gz: 3dcd9668ef0266b91c35cb3764533fab3624025a3d4dd6db86ce1adafb8168c9d72dde14bbd57fbcb73f7f0049941e6b077eaba519b70b3fa1b03eb92d730b64

data/Gemfile

@@ -9,5 +9,11 @@ gem "rspec", "~> 3.0"
 
 group :development do
   gem 'rubocop-discourse'
+end
+
+group :development, :test do
   gem 'byebug'
+  gem 'redis', '~> 4.1'
+  gem 'pg', '~> 1.2'
+  gem 'activerecord', '~> 6.0'
 end

data/Gemfile.lock

@@ -1,20 +1,82 @@
 PATH
   remote: .
   specs:
-    rails_failover (0.1.0)
-      redis (~> 4)
+    rails_failover (0.3.0)
+      activerecord (~> 6.0)
+      listen (~> 3.2)
+      railties (~> 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
+    builder (3.2.4)
     byebug (11.1.3)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     diff-lcs (1.3)
+    erubi (1.9.0)
+    ffi (1.12.2)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
     parser (2.7.1.2)
       ast (~> 2.4.0)
+    pg (1.2.3)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (12.3.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     redis (4.1.4)
     rexml (3.2.4)
     rspec (3.9.0)
@@ -43,15 +105,23 @@ GEM
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 6.0)
   byebug
+  pg (~> 1.2)
   rails_failover!
   rake (~> 12.0)
+  redis (~> 4.1)
   rspec (~> 3.0)
   rubocop-discourse
 

data/README.md

@@ -20,6 +20,22 @@ Or install it yourself as:
 
 ## Usage
 
+### ActiveRecord
+
+In `config/application.rb` add `require 'rails_failover/active_record'` after `require "active_record/railtie"`.
+
+In your database configuration, simply add `replica_host` and `replica_port` to your database configuration.
+
+```
+production:
+  host: <primary db server host>
+  port: <primary db server port>
+  replica_host: <replica db server host>
+  replica_port: <replica db server port>
+```
+
+The gem will automatically create an `ActiveRecord::ConnectionAdapters::ConnectionHandler` with the `ActiveRecord::Base.reading_role` as the `handler_key`.
+
 ### Redis
 
 ```
@@ -41,13 +57,27 @@ end
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+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.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Testing
+
+#### ActiveRecord
+
+The ActiveRecord failover tests are run against a dummy Rails server. Run the following commands to run the test:
+
+1. `make setup_pg`
+1. `make start_pg`
+1. `bin/rspec active_record`. You may also run the tests with more unicorn workers by adding the `UNICORN_WORKERS` env variable.
+
+#### Redis
+
+`bin/rspec redis`
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rails_failover. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/rails_failover/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/discourse/rails_failover. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/discourse/rails_failover/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -56,4 +86,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the RailsFailover project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/rails_failover/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the RailsFailover project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/discourse/rails_failover/blob/master/CODE_OF_CONDUCT.md).

data/bin/console

@@ -3,7 +3,8 @@
 
 require "bundler/setup"
 require "rails_failover"
-require 'redis'
+require "rails_failover/redis"
+require "rails_failover/active_record"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/bin/rspec

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-make RSPEC_PATH=$1
+RSPEC_PATH=$2 make -s $1

data/lib/rails_failover.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "rails_failover/version"
-require "redis/patches/client"
-require "rails_failover/redis"
 
 module RailsFailover
   class Error < StandardError; end

data/lib/rails_failover/active_record.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'active_record'
+require_relative 'active_record/railtie'
+require_relative 'active_record/middleware'
+require_relative 'active_record/handler'
+
+module RailsFailover
+  module ActiveRecord
+    def self.logger=(logger)
+      @logger = logger
+    end
+
+    def self.logger
+      @logger || Rails.logger
+    end
+
+    def self.verify_primary_frequency_seconds=(seconds)
+      @verify_primary_frequency_seconds = seconds
+    end
+
+    def self.verify_primary_frequency_seconds
+      @verify_primary_frequency_seconds || 5
+    end
+
+    def self.establish_reading_connection(connection_spec)
+      config = connection_spec.config
+
+      if config[:replica_host] && config[:replica_port]
+        replica_config = config.dup
+
+        replica_config[:host] = replica_config.delete(:replica_host)
+        replica_config[:port] = replica_config.delete(:replica_port)
+        replica_config[:replica] = true
+
+        handler = ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.reading_role]
+        handler.establish_connection(replica_config)
+      end
+    end
+  end
+end

data/lib/rails_failover/active_record/handler.rb

@@ -0,0 +1,172 @@
+# frozen_string_literal: true
+require 'singleton'
+require 'monitor'
+require 'listen'
+require 'fileutils'
+
+module RailsFailover
+  module ActiveRecord
+    class Handler
+      include Singleton
+      include MonitorMixin
+
+      SEPERATOR = "__RAILS_FAILOVER__"
+      VERIFY_FREQUENCY_BUFFER_PRECENT = 20
+
+      def initialize
+        @primaries_down = {}
+        @ancestor_pid = Process.pid
+
+        @dir = '/tmp/rails_failover'
+        FileUtils.remove_dir(@dir) if Dir.exists?(@dir)
+        FileUtils.mkdir_p(@dir)
+
+        @listener = Listen.to(@dir) do |modified, added, removed|
+          if added.length > 0
+            added.each do |f|
+              pid, handler_key = File.basename(f).split(SEPERATOR)
+
+              if Process.pid != pid
+                verify_primary(handler_key.to_sym, publish: false)
+              end
+            end
+          end
+
+          if removed.length > 0
+            removed.each do |f|
+              pid, handler_key = File.basename(f).split(SEPERATOR)
+
+              if Process.pid != pid
+                primary_up(handler_key.to_sym)
+              end
+            end
+          end
+        end
+
+        super() # Monitor#initialize
+      end
+
+      def start_listener
+        @listener.start
+      end
+
+      def verify_primary(handler_key, publish: true)
+        mon_synchronize do
+          primary_down(handler_key)
+          publish_primary_down(handler_key) if publish
+          return if @thread&.alive? && @thread["pid"] == Process.pid
+
+          @thread = Thread.new do
+            loop do
+              initiate_fallback_to_primary
+              break if all_primaries_up
+            end
+          end
+
+          @thread["pid"] = Process.pid
+          @thread
+        end
+      end
+
+      def initiate_fallback_to_primary
+        frequency = RailsFailover::ActiveRecord.verify_primary_frequency_seconds
+        sleep(frequency * ((rand(VERIFY_FREQUENCY_BUFFER_PRECENT) + 100) / 100.0))
+
+        active_handler_keys = []
+
+        primaries_down.keys.each do |handler_key|
+          connection_handler = ::ActiveRecord::Base.connection_handlers[handler_key]
+          spec = connection_handler.retrieve_connection_pool(spec_name).spec
+          config = spec.config
+          logger.warn "#{Process.pid} Checking server for '#{handler_key} #{spec_name}'..."
+          connection_active = false
+
+          begin
+            connection = ::ActiveRecord::Base.public_send(spec.adapter_method, config)
+            connection_active = connection.active?
+          rescue => e
+            logger.warn "#{Process.pid} Connection to server for '#{handler_key} #{spec_name}' failed with '#{e.message}'"
+          ensure
+            connection.disconnect! if connection
+          end
+
+          if connection_active
+            logger.warn "#{Process.pid} Server for '#{handler_key} #{spec_name}' is active."
+            active_handler_keys << handler_key
+          end
+        end
+
+        active_handler_keys.each do |handler_key|
+          primary_up(handler_key)
+          publish_primary_up(handler_key)
+        end
+      end
+
+      def primary_down?(handler_key)
+        primaries_down[handler_key]
+      end
+
+      private
+
+      def all_primaries_up
+        mon_synchronize do
+          primaries_down.empty?
+        end
+      end
+
+
+      def primary_down(handler_key)
+        mon_synchronize do
+          primaries_down[handler_key] = true
+        end
+      end
+
+      def publish_primary_down(handler_key)
+        FileUtils.touch("#{@dir}/#{Process.pid}#{SEPERATOR}#{handler_key}")
+      end
+
+      def publish_primary_up(handler_key)
+        path = "#{@dir}/#{Process.pid}#{SEPERATOR}#{handler_key}"
+
+        if File.exists?(path)
+          FileUtils.rm("#{@dir}/#{Process.pid}#{SEPERATOR}#{handler_key}")
+        end
+      end
+
+      def primary_up(handler_key)
+        mon_synchronize do
+          primaries_down.delete(handler_key)
+        end
+      end
+
+      def spec_name
+        ::ActiveRecord::Base.connection_specification_name
+      end
+
+      def primaries_down
+        process_pid = Process.pid
+        return @primaries_down[process_pid] if @primaries_down[process_pid]
+
+        mon_synchronize do
+          if !@primaries_down[process_pid]
+            @primaries_down[process_pid] = @primaries_down[@ancestor_pid] || {}
+
+            if process_pid != @ancestor_pid
+              @primaries_down.delete(@ancestor_pid)
+
+              @primaries_down[process_pid].each_key do |handler_key|
+                verify_primary(handler_key)
+              end
+            end
+          end
+
+          @primaries_down[process_pid]
+        end
+      end
+
+      def logger
+        Rails.logger
+      end
+    end
+  end
+end

data/lib/rails_failover/active_record/middleware.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module RailsFailover
+  module ActiveRecord
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        writing_role = ::ActiveRecord::Base.writing_role
+
+        role =
+          if primary_down = Handler.instance.primary_down?(writing_role)
+            ::ActiveRecord::Base.reading_role
+          else
+            ::ActiveRecord::Base.writing_role
+          end
+
+        ::ActiveRecord::Base.connected_to(role: role) do
+          env["rails_failover.role"] = role
+          @app.call(env)
+        end
+      rescue Exception => e
+        if (resolve_cause(e).is_a?(::PG::Error))
+          Handler.instance.verify_primary(writing_role)
+          raise
+        end
+      end
+
+      private
+
+      def resolve_cause(error)
+        if error.cause
+          resolve_cause(error.cause)
+        else
+          error
+        end
+      end
+    end
+  end
+end

data/lib/rails_failover/active_record/railtie.rb

@@ -0,0 +1,36 @@
+module RailsFailover
+  module ActiveRecord
+    class Railtie < ::Rails::Railtie
+      initializer "rails_failover.init", after: "active_record.initialize_database" do
+        ::ActiveSupport.on_load(:active_record) do
+          Handler.instance
+
+          # We are doing this manually for now since we're awaiting Rails 6.1 to be released which will
+          # have more stable ActiveRecord APIs for handling multiple databases with different roles.
+          ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.reading_role] =
+            ::ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+
+          ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.writing_role].connection_pools.each do |connection_pool|
+            RailsFailover::ActiveRecord.establish_reading_connection(connection_pool.spec)
+          end
+
+          begin
+            ::ActiveRecord::Base.connection
+          rescue ::ActiveRecord::NoDatabaseError
+            # Do nothing since database hasn't been created
+          rescue ::PG::Error => e
+            Handler.instance.verify_primary(::ActiveRecord::Base.writing_role)
+            ::ActiveRecord::Base.connection_handler = ::ActiveRecord::Base.lookup_connection_handler(:reading)
+          end
+        end
+      end
+
+      initializer "rails_failover.insert_middleware" do |app|
+        app.middleware.insert_after(
+          ::ActionDispatch::ActionableExceptions,
+          ::RailsFailover::ActiveRecord::Middleware
+        )
+      end
+    end
+  end
+end

data/lib/rails_failover/redis.rb

@@ -1,5 +1,14 @@
 # frozen_string_literal: true
 
+require 'redis'
+
+supported_version = '4'
+
+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'
 
 module RailsFailover

data/lib/rails_failover/redis/connector.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'failover_handler'
+require_relative 'handler'
 
 module RailsFailover
   class Redis
-    class Connector
+    class Connector < ::Redis::Client::Connector
       def initialize(options)
         options[:original_driver] = options[:driver]
 
@@ -22,7 +22,7 @@ module RailsFailover
                  Errno::ETIMEDOUT,
                  Errno::EINVAL => e
 
-            FailoverHandler.instance.verify_master(options.dup)
+            Handler.instance.verify_master(options.dup)
             raise e
           end
         end
@@ -33,15 +33,15 @@ module RailsFailover
       end
 
       def resolve
-        FailoverHandler.instance.master ? @options : @replica_options
+        Handler.instance.master ? @options : @replica_options
       end
 
       def check(client)
-        FailoverHandler.instance.register_client(client)
+        Handler.instance.register_client(client)
       end
 
       def on_disconnect(client)
-        FailoverHandler.instance.deregister_client(client)
+        Handler.instance.deregister_client(client)
       end
 
       private

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

@@ -5,7 +5,7 @@ require 'singleton'
 
 module RailsFailover
   class Redis
-    class FailoverHandler
+    class Handler
       include Singleton
       include MonitorMixin
 

data/lib/rails_failover/version.rb

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

data/makefile

@@ -1,31 +1,21 @@
-PORT               := 6381
-PID_PATH           := /tmp/redis.pid
-SOCKET_PATH        := /tmp/redis.sock
-DBFILENAME         := master.rdb
-replica_port         := 6382
-REPLICA_PID_PATH     := /tmp/redis_replica.pid
-REPLICA_SOCKET_PATH  := /tmp/redis_replica.sock
-REPLICA_DBFILENAME   := replica.rdb
+include postgresql.mk
+include redis.mk
 
-default:
-	@make -s all
+all: redis
 
-all: start test stop
+active_record: teardown_dummy_rails_server setup_dummy_rails_server test_active_record
 
-test:
-	bundle exec rspec ${RSPEC_PATH}
+test_active_record:
+	@ACTIVE_RECORD=1 bundle exec rspec --tag type:active_record ${RSPEC_PATH}
 
-start: start_master start_replica
-stop: stop_replica stop_master
+setup_dummy_rails_server:
+	@cd spec/support/dummy_app && bundle install --quiet --without test --without development && yarn install && RAILS_ENV=production $(BUNDLER_BIN) exec rails db:create db:migrate db:seed
 
-stop_master:
-	@redis-cli -p ${PORT} shutdown
+start_dummy_rails_server:
+	@cd spec/support/dummy_app && BUNDLE_GEMFILE=Gemfile bundle exec unicorn -c config/unicorn.conf.rb -D -E production
 
-start_master:
-	@redis-server --daemonize yes --pidfile ${PID_PATH} --port ${PORT} --unixsocket ${SOCKET_PATH} --dbfilename ${DBFILENAME} --logfile /dev/null
+stop_dummy_rails_server:
+	@kill -TERM $(shell cat spec/support/dummy_app/tmp/pids/unicorn.pid)
 
-stop_replica:
-	@redis-cli -p ${replica_port} shutdown
-
-start_replica:
-	@redis-server --daemonize yes --pidfile ${REPLICA_PID_PATH} --port ${replica_port} --unixsocket ${REPLICA_SOCKET_PATH} --replicaof 127.0.0.1 ${PORT} --dbfilename ${REPLICA_DBFILENAME} --logfile /dev/null
+teardown_dummy_rails_server:
+	@cd spec/support/dummy_app && DISABLE_DATABASE_ENVIRONMENT_CHECK=1 RAILS_ENV=production $(BUNDLER_BIN) exec rails db:drop

data/postgresql.mk

@@ -0,0 +1,54 @@
+PG_BIN_DIR               := $(shell pg_config --bindir)
+PWD                      := $(shell pwd)
+PG_PRIMARY_DIR           := $(PWD)/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_DATA_DIR      := $(PG_REPLICA_DIR)/data
+PG_REPLICA_RUN_DIR       := $(PG_REPLICA_DIR)/run
+PG_PRIMARY_PORT          := 5434
+PG_REPLICA_PORT          := 5435
+PG_REPLICATION_USER      := replication
+PG_REPLICATION_PASSWORD  := password
+PG_REPLICATION_SLOT_NAME := replication
+
+setup_pg: init_primary start_pg_primary setup_primary init_replica stop_pg_primary
+
+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
+
+stop_pg: stop_pg_replica stop_pg_primary
+
+init_primary:
+	@mkdir -p $(PG_PRIMARY_DATA_DIR)
+	@mkdir -p $(PG_PRIMARY_RUN_DIR)
+	@$(PG_BIN_DIR)/initdb -E UTF8 -D $(PG_PRIMARY_DATA_DIR)
+
+init_replica:
+	@mkdir -p $(PG_REPLICA_DATA_DIR)
+	@mkdir -p $(PG_REPLICA_RUN_DIR)
+	@PGPASSWORD=$(PG_REPLICATION_PASSWORD) $(PG_BIN_DIR)/pg_basebackup -D $(PG_REPLICA_DATA_DIR) -X stream -h $(PG_PRIMARY_RUN_DIR) -p $(PG_PRIMARY_PORT) -U $(PG_REPLICATION_USER) -w -R
+	@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
+
+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
+
+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
+
+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
+
+cleanup_pg:
+	@rm -rf $(PG_PRIMARY_DIR) $(PG_REPLICA_DIR)

data/rails_failover.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Alan Tan"]
   spec.email         = ["tgx@discourse.org"]
 
-  spec.summary       = %q{Failover for PostgreSQL and Redis}
+  spec.summary       = %q{Failover for ActiveRecord and Redis}
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
@@ -21,5 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency('redis', '~> 4')
+  spec.add_dependency 'listen', "~> 3.2"
+
+  ["activerecord", "railties"].each do |gem_name|
+    spec.add_dependency gem_name, "~> 6.0"
+  end
 end

data/redis.mk

@@ -0,0 +1,28 @@
+REDIS_PORT                 := 6381
+REDIS_PID_PATH             := /tmp/redis.pid
+REDIS_SOCKET_PATH          := /tmp/redis.sock
+REDIS_DBFILENAME           := master.rdb
+REDIS_REPLICA_PORT         := 6382
+REDIS_REPLICA_PID_PATH     := /tmp/redis_replica.pid
+REDIS_REPLICA_SOCKET_PATH  := /tmp/redis_replica.sock
+REDIS_REPLICA_DBFILENAME   := replica.rdb
+
+redis: start_redis test_redis stop_redis
+
+test_redis:
+	@REDIS=1 bundle exec rspec --tag type:redis ${RSPEC_PATH}
+
+start_redis: start_redis_master start_redis_replica
+stop_redis: stop_redis_replica stop_redis_master
+
+stop_redis_master:
+	@redis-cli -p ${REDIS_PORT} shutdown
+
+start_redis_master:
+	@redis-server --daemonize yes --pidfile ${REDIS_PID_PATH} --port ${REDIS_PORT} --unixsocket ${REDIS_SOCKET_PATH} --dbfilename ${REDIS_DBFILENAME} --logfile /dev/null
+
+stop_redis_replica:
+	@redis-cli -p ${REDIS_REPLICA_PORT} shutdown
+
+start_redis_replica:
+	@redis-server --daemonize yes --pidfile ${REDIS_REPLICA_PID_PATH} --port ${REDIS_REPLICA_PORT} --unixsocket ${REDIS_REPLICA_SOCKET_PATH} --replicaof 127.0.0.1 ${REDIS_PORT} --dbfilename ${REDIS_REPLICA_DBFILENAME} --logfile /dev/null

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alan Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: 
 email:
 - tgx@discourse.org
@@ -45,13 +73,19 @@ files:
 - bin/rspec
 - bin/setup
 - lib/rails_failover.rb
+- lib/rails_failover/active_record.rb
+- lib/rails_failover/active_record/handler.rb
+- 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/failover_handler.rb
+- lib/rails_failover/redis/handler.rb
 - lib/rails_failover/version.rb
 - lib/redis/patches/client.rb
 - makefile
+- postgresql.mk
 - rails_failover.gemspec
+- redis.mk
 homepage: 
 licenses:
 - MIT
@@ -74,5 +108,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Failover for PostgreSQL and Redis
+summary: Failover for ActiveRecord and Redis
 test_files: []