rails_failover 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d891800bc3c474ab5d6bb2f9c9de5143b282e0d8bca7abaaf7e961ecc0de5d2b
-  data.tar.gz: 6ae3d0e02913ab900e6cc4428a6c07e7ccea9e5d61325ae51d807d3ddeae0106
+  metadata.gz: 6568f67088bad641f6ca7c96f477713d59baeee1992b2acba1e6db9568d55cce
+  data.tar.gz: 3978f5d594cb5efb953d937bd95a9e8778ec2c1caa0b35903889e246b55c872a
 SHA512:
-  metadata.gz: 56267ae5f7529d55fd1612f5e6af3e922f0930bc06416783df658aa94edafc0a6e79053097668f22fe715964fc54c9636c785bb9b6476bbcdd36cd5e8bd0994a
-  data.tar.gz: 05203aaec3c90fbc314bf91ed8b60a9269b88597e74e665ebdad4a9341f2cc109be81dfb3adaec2bcc356fc34180235cb8d7d0e3e39a3db3cd088d6601f17907
+  metadata.gz: dae66bec185b1254788bcd3ef7a60c638105077803358408a3275cd7f5fa6e928706e525c7cf3f9f051e74241e5ee0da9e5e390729fc4b7c624fb4f2f23a5b26
+  data.tar.gz: cfc083e71f1514cdb7a884693cb077c09bf28372a46ee9fd51eab45bfbb4528a0909f67ae2be434c0ba51761562e8cfe06c3ecf251259c7ec83c44a302ab5d77

data/CHANGELOG.md

@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.3] - 2021-04-15
+
+- FEATURE: Compatibility with Rails 6.1
+
+## [0.7.2] - 2021-04-14
+
+No changes.
+
+## [0.7.1] - 2021-04-14
+
+- FIX: Backward compatability with Rails 6.0
+
+## [0.7.0] - 2021-04-14
+
+- FEATURE: Partial compatibility with Rails 6.1
+
 ## [0.6.5] - 2020-12-16
 
 - FIX: Catch exceptions that are not intercepted by `ActionDispatch::DebugExceptions`.

data/lib/rails_failover/active_record.rb

@@ -27,8 +27,7 @@ module RailsFailover
       @verify_primary_frequency_seconds || 5
     end
 
-    def self.establish_reading_connection(handler, connection_spec)
-      config = connection_spec.config
+    def self.establish_reading_connection(handler, config)
 
       if config[:replica_host] && config[:replica_port]
         replica_config = config.dup

data/lib/rails_failover/active_record/handler.rb

@@ -56,13 +56,20 @@ module RailsFailover
 
         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
+
+          connection_pool = connection_handler.retrieve_connection_pool(spec_name)
+          if connection_pool.respond_to?(:db_config)
+            config = connection_pool.db_config.configuration_hash
+            adapter_method = connection_pool.db_config.adapter_method
+          else
+            config = connection_pool.spec.config
+            adapter_method = connection_pool.spec.adapter_method
+          end
           logger.debug "#{Process.pid} Checking server for '#{handler_key} #{spec_name}'..."
           connection_active = false
 
           begin
-            connection = ::ActiveRecord::Base.public_send(spec.adapter_method, config)
+            connection = ::ActiveRecord::Base.public_send(adapter_method, config)
             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/middleware.rb

@@ -80,7 +80,12 @@ module RailsFailover
           handler = ::ActiveRecord::ConnectionAdapters::ConnectionHandler.new
 
           ::ActiveRecord::Base.connection_handlers[writing_role].connection_pools.each do |pool|
-            ::RailsFailover::ActiveRecord.establish_reading_connection(handler, pool.spec)
+            if pool.respond_to?(:db_config)
+              config = pool.db_config.configuration_hash
+            else
+              config = pool.spec.config
+            end
+            ::RailsFailover::ActiveRecord.establish_reading_connection(handler, config)
           end
 
           handler

data/lib/rails_failover/active_record/railtie.rb

@@ -27,9 +27,14 @@ module RailsFailover
               ::ActiveRecord::ConnectionAdapters::ConnectionHandler.new
 
             ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.writing_role].connection_pools.each do |connection_pool|
+              if connection_pool.respond_to?(:db_config)
+                config = connection_pool.db_config.configuration_hash
+              else
+                config = connection_pool.spec.config
+              end
               RailsFailover::ActiveRecord.establish_reading_connection(
                 ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.reading_role],
-                connection_pool.spec
+                config
               )
             end
 
@@ -37,7 +42,7 @@ module RailsFailover
               ::ActiveRecord::Base.connection
             rescue ::ActiveRecord::NoDatabaseError
               # Do nothing since database hasn't been created
-            rescue ::PG::Error
+            rescue ::PG::Error, ::ActiveRecord::ConnectionNotEstablished
               Handler.instance.verify_primary(::ActiveRecord::Base.writing_role)
               ::ActiveRecord::Base.connection_handler = ::ActiveRecord::Base.lookup_connection_handler(:reading)
             end

data/lib/rails_failover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Alan Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord