redic-sentinels 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f2c98ea246c4dee97dca3fe3757fec01f0b1e3
-  data.tar.gz: 5c871add547ae0d15a034886e5480f284f000e7c
+  metadata.gz: f0e8550b89021d10e045dad3f86d743c37ee9fb2
+  data.tar.gz: 39f57b52ec8f223410a66ef7626417ce8813c828
 SHA512:
-  metadata.gz: 6740acd8892fe316e54a0af8847cb1a110e9e618c461e2c2cd08e68458b06f389e49a2a1cbf24e85146269c50f08d61b922073988e7e74626146534f95fae982
-  data.tar.gz: 06188323e825f5db6efe3aac9d2546d1c20491c89ff6b6cccdd1ae543c21a09312b780d4fe7f52e235a43cf276b4143f68cf1b7f4214c126dd3dbf52aedaf9f6
+  metadata.gz: 4a433bf3cdd1d3dcca0c97c9b496b38ddc84e327dedeb47b0e709de68afa517acc972ed3f3d001b3fa693abf669f4ea7dbc853fa78678433e57147caf00070f0
+  data.tar.gz: e0a165dedee7ec34a46df0ba04e4b0c4dc98405342d4f1798121bfd795df8c775c7e7c2ab369f20016dee1f362005596520aa805ca6d75de82ef62f6e724807a

data/README.md

@@ -38,7 +38,8 @@ hosts = [
 redis = Redic::Sentinels.new hosts: hosts, 
                              master_name: 'mymaster', 
                              db: 1, # optional (default: 0)
-                             password: 'pass' # optional
+                             password: 'pass', # optional
+                             max_retries: 5 # optional (default: 3): Number of attempts to reconnect to master
 
 redis.call 'PING' # => 'PONG'
 ```

data/lib/redic/sentinels.rb

@@ -16,6 +16,7 @@ class Redic
       @password    = options[:password]
       @db          = options.fetch(:db, 0)
       @timeout     = options[:timeout]
+      @max_retries = options.fetch(:max_retries, 3)
 
       establish_connection
     end
@@ -66,10 +67,18 @@ class Redic
     attr_reader :redis
 
     def forward
-      yield
-    rescue Errno::ECONNREFUSED
-      establish_connection
-      retry
+      yield.tap do |result|
+        @retry_attempts = 0
+      end
+    rescue => ex
+      @retry_attempts ||= 0
+      if @retry_attempts < @max_retries
+        establish_connection
+        @retry_attempts += 1
+        retry
+      else
+        raise ex
+      end
     end
 
     def establish_connection

data/lib/redic/sentinels/version.rb

@@ -1,5 +1,5 @@
 class Redic
   class Sentinels
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/sentinels_spec.rb

@@ -21,15 +21,18 @@ describe Redic::Sentinels do
     redis.client.configure "redis://#{INVALID_HOSTS.sample}", 10_000_000
   end
 
-  after do
-    master = Redic.new 'redis://localhost:16379'
-    master.call! 'FLUSHDB'
-  end
-
   describe 'Connection success' do
 
     let(:redis) { Redic::Sentinels.new hosts: HOSTS, master_name: MASTER_NAME }
 
+    let(:sentinel) { Redic.new "redis://#{VALID_HOSTS.first}" }
+    
+    after do
+      _, port = sentinel.call 'SENTINEL', 'get-master-addr-by-name', MASTER_NAME
+      master = Redic.new "redis://localhost:#{port}"
+      master.call! 'FLUSHDB'
+    end
+
     it 'call' do
       redis.call('PING').must_equal 'PONG'
       redis.call('INVALID_COMMAND').must_be_instance_of RuntimeError
@@ -80,18 +83,36 @@ describe Redic::Sentinels do
       redis.commit.must_equal ['PONG', 'PONG']
     end
 
+    it 'Retry on Master change' do
+      redis.call('PING').must_equal 'PONG'
+
+      redis.call('PING').must_equal 'PONG'
+      redis.queue('PING').must_equal [['PING']]
+
+      sentinel.call 'SENTINEL', 'failover', 'mymaster'
+
+      redis.call('PING').must_equal 'PONG'
+      redis.queue('PING').must_equal [['PING'], ['PING']]
+
+      redis.queue('PING').must_equal [['PING'], ['PING'], ['PING']]
+      redis.commit.must_equal ['PONG', 'PONG', 'PONG']
+    end
+
     it 'Default DB' do
-      redis.url.must_equal 'redis://127.0.0.1:16379/0'
+      ip, port = sentinel.call 'SENTINEL', 'get-master-addr-by-name', MASTER_NAME
+      redis.url.must_equal "redis://#{ip}:#{port}/0"
     end
 
     it 'Custom DB' do
+      ip, port = sentinel.call 'SENTINEL', 'get-master-addr-by-name', MASTER_NAME
       redis = Redic::Sentinels.new hosts: HOSTS, master_name: MASTER_NAME, db: 7
-      redis.url.must_equal 'redis://127.0.0.1:16379/7'
+      redis.url.must_equal "redis://#{ip}:#{port}/7"
     end
 
     it 'Auth' do
+      ip, port = sentinel.call 'SENTINEL', 'get-master-addr-by-name', MASTER_NAME
       redis = Redic::Sentinels.new hosts: HOSTS, master_name: MASTER_NAME, password: 'pass'
-      redis.url.must_equal 'redis://:pass@127.0.0.1:16379/0'
+      redis.url.must_equal "redis://:pass@#{ip}:#{port}/0"
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redic-sentinels
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic