rails_failover 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146164de9729fe33317969e8d3ca2c5c79980e947f93dfd32b6673a1a95061a6
-  data.tar.gz: d3e6eb2cee6bcf663115e72c9e62d62e3f869753549fdcff55381ca4405842c1
+  metadata.gz: 9b0f3e010743d83bd67b2cce785fde0952ba32c82c8c1ab5fef3aa56e5baa520
+  data.tar.gz: 26cc2466069dfe48b691d8676078b3ed9ee3ce82e7a8d4447fa327436741fd39
 SHA512:
-  metadata.gz: 1554851137a5251f524574f7d0120924910ad3dc755ad336e9c29c7404cf515d79dad9cb538f06b4084363d919f37586f412f5702fb92a2c85678bd161349fd3
-  data.tar.gz: 0f2a72692577a2be3d961da51be3ba150b7e7311fbe2932b062443d2a10dba6014e04268be105a815ab08169b542aa0d3a26dbe36611f036eecdc7a17bb527ac
+  metadata.gz: 5ce28a0d758dde383537bce455502edfcbf9388ad4c2835edc17b2e259156affc885153f728e39fa66c8c25d3f9dfea34a8f489b663e7738fc092dc6c76dccb8
+  data.tar.gz: 0f0c08446e0e64c5eb6ee972e80e8776e58fbd32877254e50098a17a4d4475db64379d7ad237933b054e5eaf7c54df72785c69253e7d31be1b28d38028fcaf11

data/README.md

@@ -53,7 +53,7 @@ end
 
 #### Multiple connection handlers
 
-Note: This API is unstable and is likely to changes when Rails 6.1 is released with sharding support.
+Note: This API is unstable and is likely to change when Rails 6.1 is released with sharding support.
 
 ```
 # config/database.yml

data/lib/rails_failover/redis/handler.rb

@@ -169,7 +169,7 @@ module RailsFailover
       # Calling .disconnect can cause a running subscribe() to block forever
       # Therefore try to acquire the lock
       def soft_disconnect(redis, client, role)
-        has_lock = redis.mon_try_enter
+        has_lock = redis_mon_try_enter(redis)
 
         if !has_lock
           begin
@@ -180,7 +180,7 @@ module RailsFailover
 
           waiting_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           loop do # Keep trying
-            break if has_lock = redis.mon_try_enter
+            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
             time_now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -191,12 +191,28 @@ module RailsFailover
 
         client.disconnect if client.connection&.rails_failover_role == role
       ensure
-        redis.mon_exit if has_lock
+        redis_mon_exit(redis) if has_lock
       end
 
       def logger
         RailsFailover::Redis.logger
       end
+
+      def redis_mon_try_enter(redis)
+        if redis.respond_to? :mon_try_enter
+          redis.mon_try_enter
+        else
+          redis.instance_variable_get(:@monitor).mon_try_enter
+        end
+      end
+
+      def redis_mon_exit(redis)
+        if redis.respond_to? :mon_exit
+          redis.mon_exit
+        else
+          redis.instance_variable_get(:@monitor).mon_exit
+        end
+      end
     end
   end
 end

data/lib/rails_failover/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Alan Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord