rails_failover 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab1bfea9c1e882693a3455a73601edce7c0ed2af5b50ec1276cf95e1dda51d5
-  data.tar.gz: 4cf4386f6d51dbae3f82bedcb56c8da3ac4674b254a1b475e2822b46d4a5b8ed
+  metadata.gz: de312681fb912d8d00ffaaf362f8c2201a95066660759aa92393d3212753e6c9
+  data.tar.gz: 006af26908149488773d664dea57d761ff24304516ae7b65139b20d288f0ab85
 SHA512:
-  metadata.gz: 4b22d9f037c18ca0c82a61764494e5b8a3a41a30a514b12f8d9dec1737e24fb251729457abb8e0f3ab596ab511db98e776740b7a62646313dd542c10c945cbce
-  data.tar.gz: a653959c37717e01e30ff82c0b1594b71e2a402c13073c6e0bf1ee6176d588dc2fcd3c165cd69e294c7fbe0b66bc0e944e36e5fb176b7306ac92dc028a15fb0b
+  metadata.gz: 634c701d2d4ba73e4b45efed2de949797521c7d390586eeec412f3d6749d93b446bde1b51b53ddc37a41d0e3e79d18902a154a22e07f1bad8528d365822f0614
+  data.tar.gz: 7c4126b04c1792cb26c98f3532e3cc815d0aaca6aed9cda20831315f826075b362d23d5863c942415a018157553e156e24c9dff128751ea5138c59f6799efecd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_failover (0.5.0)
+    rails_failover (0.5.1)
       activerecord (~> 6.0)
       railties (~> 6.0)
 

data/lib/rails_failover/active_record/handler.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'singleton'
 require 'monitor'
-require 'fileutils'
 
 module RailsFailover
   module ActiveRecord
@@ -9,7 +8,6 @@ module RailsFailover
       include Singleton
       include MonitorMixin
 
-      SEPERATOR = "__RAILS_FAILOVER__"
       VERIFY_FREQUENCY_BUFFER_PRECENT = 20
 
       def initialize

data/lib/rails_failover/active_record/railtie.rb

@@ -3,40 +3,49 @@
 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(
-              ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.reading_role],
-              connection_pool.spec
-            )
-          end
+      initializer "rails_failover.init", after: "active_record.initialize_database" do |app|
+        config = ::ActiveRecord::Base.connection_config
+        app.config.active_record_rails_failover = false
+
+        if !!(config[:replica_host] && config[:replica_port])
+          app.config.active_record_rails_failover = true
+
+          ::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
 
-          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)
+            ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.writing_role].connection_pools.each do |connection_pool|
+              RailsFailover::ActiveRecord.establish_reading_connection(
+                ::ActiveRecord::Base.connection_handlers[::ActiveRecord::Base.reading_role],
+                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
       end
 
       initializer "rails_failover.insert_middleware" do |app|
-        ActionDispatch::DebugExceptions.register_interceptor do |request, exception|
-          RailsFailover::ActiveRecord::Interceptor.handle(request, exception)
-        end
+        if app.config.active_record_rails_failover
+          ActionDispatch::DebugExceptions.register_interceptor do |request, exception|
+            RailsFailover::ActiveRecord::Interceptor.handle(request, exception)
+          end
 
-        if !skip_middleware?(app.config)
-          app.middleware.unshift(::RailsFailover::ActiveRecord::Middleware)
+          if !skip_middleware?(app.config)
+            app.middleware.unshift(::RailsFailover::ActiveRecord::Middleware)
+          end
         end
       end
 

data/lib/rails_failover/redis/handler.rb

@@ -2,7 +2,6 @@
 
 require 'monitor'
 require 'singleton'
-require 'digest'
 
 module RailsFailover
   class Redis
@@ -13,7 +12,6 @@ module RailsFailover
       PRIMARY_ROLE_STATUS = "role:master"
       PRIMARY_LOADED_STATUS = "loading:0"
       VERIFY_FREQUENCY_BUFFER_PRECENT = 20
-      SEPERATOR = "__RAILS_FAILOVER__"
 
       def initialize
         @primaries_down = {}
@@ -123,10 +121,6 @@ module RailsFailover
 
       private
 
-      def id_digest(id)
-        Digest::MD5.hexdigest(id)
-      end
-
       def all_primaries_up
         mon_synchronize { primaries_down.empty? }
       end

data/lib/rails_failover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Alan Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord