rails_failover 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 307c740884b5d0f566b0013a076133f2e951cf2c3b24336f83ff8e9510ccf95f
-  data.tar.gz: 8a4cc918de939e67c6665c45416b05a4230f79bef9b9efa9f5520cd880e2c3f2
+  metadata.gz: 6b47ce7eef70576e83fe137949d50e280677f6f5e2444790a9bdf7cc1708f540
+  data.tar.gz: eea78a86a311a24926c83ab4450eae6ed59b0f39a60faafdf9affe050074aa7d
 SHA512:
-  metadata.gz: ec87d7a536a603645d5b4d1c509f1203156c39b1b2bdeb023629727bf73255b46fda97f3d4bd0e363a01871287cc5571653b1d4a53fc1052759c565dab68d441
-  data.tar.gz: 4b104f60e06dafd0c8c1170c289113fb844bc3b48b6af74c3eedb09fae1814e0cc0421f29949d7f93322e8edf9fa9779a958de3538940f45ce6418bc8a1cfb0c
+  metadata.gz: 46aea75592369b8a0af7a48ee1898d2fdfecb8a80ebc777ba386052709678258d719a7e2e2d4d00f1c6c3ca7d158747eecb0a329373ff3a8f6423c6f70824f27
+  data.tar.gz: aa006f95128b6ec9fe600652c62d20c32b948aeff049cf2155d5366b97a57d851631e8de6c128f2f0587c0e4d97a797252b5c2f196a98d7d245e3b0a539d8b53

data/.gitignore

@@ -14,3 +14,5 @@
 
 # Redis database files
 *.rdb
+
+*.gem

data/README.md

@@ -41,7 +41,7 @@ end
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `make test` 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. Then, run `bin/rspec` to run the tests. 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).
 

data/bin/rspec

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

data/lib/rails_failover.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rails_failover/version"
+require "redis/patches/client"
 require "rails_failover/redis"
 
 module RailsFailover

data/lib/rails_failover/redis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'redis/connector'
 
 module RailsFailover

data/lib/rails_failover/redis/connector.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require_relative 'fallback_handler'
+
+require_relative 'failover_handler'
 
 module RailsFailover
   class Redis
@@ -21,8 +22,7 @@ module RailsFailover
                  Errno::ETIMEDOUT,
                  Errno::EINVAL => e
 
-            FallbackHandler.instance.master = false
-            FallbackHandler.instance.verify_master(options.dup)
+            FailoverHandler.instance.verify_master(options.dup)
             raise e
           end
         end
@@ -33,11 +33,15 @@ module RailsFailover
       end
 
       def resolve
-        FallbackHandler.instance.master ? @options : @replica_options
+        FailoverHandler.instance.master ? @options : @replica_options
       end
 
       def check(client)
-        FallbackHandler.instance.register_client(client)
+        FailoverHandler.instance.register_client(client)
+      end
+
+      def on_disconnect(client)
+        FailoverHandler.instance.deregister_client(client)
       end
 
       private

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'monitor'
 require 'singleton'
 
 module RailsFailover
   class Redis
-    class FallbackHandler
+    class FailoverHandler
       include Singleton
       include MonitorMixin
 
@@ -22,13 +23,15 @@ module RailsFailover
         mon_synchronize do
           return if @thread&.alive?
 
+          self.master = false
+          disconnect_clients
           RailsFailover::Redis.master_down_callbacks.each { |callback| callback.call }
 
           @thread = Thread.new do
             loop do
               thread = Thread.new { initiate_fallback_to_master(options) }
               thread.join
-              break if mon_synchronize { @master }
+              break if self.master
               sleep (RailsFailover::Redis.verify_master_frequency_seconds + (Time.now.to_i % RailsFailover::Redis.verify_master_frequency_seconds))
             ensure
               thread.kill
@@ -64,6 +67,16 @@ module RailsFailover
         end
       end
 
+      def deregister_client(client)
+        mon_synchronize do
+          @clients.delete(client)
+        end
+      end
+
+      def clients
+        mon_synchronize { @clients }
+      end
+
       def master
         mon_synchronize { @master }
       end
@@ -76,8 +89,9 @@ module RailsFailover
 
       def disconnect_clients
         mon_synchronize do
-          @clients.each(&:disconnect)
-          @clients.clear
+          @clients.dup.each do |c|
+            c.disconnect
+          end
         end
       end
 

data/lib/rails_failover/version.rb

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

data/lib/redis/patches/client.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'redis'
+
+# See https://github.com/redis/redis-rb/pull/908
+class Redis::Client
+  def disconnect
+    if connected?
+      result = connection.disconnect
+      @connector.on_disconnect(self)
+      result
+    end
+  end
+end
+
+class Redis::Client::Connector
+  def on_disconnect(client)
+  end
+end

data/makefile

@@ -13,7 +13,7 @@ default:
 all: start test stop
 
 test:
-	bundle exec rspec
+	bundle exec rspec ${RSPEC_PATH}
 
 start: start_master start_replica
 stop: stop_replica stop_master

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alan Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -42,12 +42,14 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - lib/rails_failover.rb
 - lib/rails_failover/redis.rb
 - lib/rails_failover/redis/connector.rb
-- lib/rails_failover/redis/fallback_handler.rb
+- lib/rails_failover/redis/failover_handler.rb
 - lib/rails_failover/version.rb
+- lib/redis/patches/client.rb
 - makefile
 - rails_failover.gemspec
 homepage: