redis-sentinel 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f65c37fc86df6375c442c0f8aad24eb6d02b7e
-  data.tar.gz: 77ed5c965346ca00f5ce1aec7d30e5a2109ebf7a
+  metadata.gz: 85e2d012825c2c5f740cd1f33ea4f1f6ac5e8c4a
+  data.tar.gz: 3d21614c18f64cf3e2912521f5390a1eee03fb01
 SHA512:
-  metadata.gz: e486e2b913b004c0ed6fd09c6d80ca905e3f6026d27c523115f9b08895356e761a0def2ecc551a799b554e3a3fe558e3580246e3cc07f7aec0564ff9582ff2de
-  data.tar.gz: 60f1261aff29cf43b2304efb67606e1d631e28a1a711f2b71683d86566845981bc2b86581d66cb528dcba170d4ccd8868ee9ada163dbeb257cab6a33d395a322
+  metadata.gz: b5a62c1d6196a9ae88ee0609af812c98345087ec287f0860f9c5f7da61d5cb420ac7d61849257048e49c2c540cfcd17d75440f6d786e29f121cbe83536747167
+  data.tar.gz: b2186c8627bea8d15615401648b78f15180ffbadf3fa4e25731bc6c54c263cd658b4685c4da3349583f3f7e19a8f80605b409782d0848fdea22c18b11cafd1f7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.4.4
+
+* Allow client to return list of slaves
+* Fix compatibility issues with ruby 1.8.7
+
 ## 1.4.3
 
 * Fix for pipelined requests and readonly calls

data/README.md

@@ -46,6 +46,20 @@ There are two additional options:
 2. `:failover_reconnect_wait` (seconds) how long to sleep after each
    failed reconnect during a failover event. Defaults to 0.1s.
 
+## Slaves clients
+
+If you need it, you can get an array of Redis clients, each pointing to one of the slaves:
+
+    client = Redis.new(master_name: "master1", sentinels: [{host: "localhost", port: 26379}, {host: "localhost", port: 26380}])
+    client.slaves
+    # => [#<Redis client v3.0.7 for redis://127.0.0.1:6380/0>, #<Redis client v3.0.7 for redis://127.0.0.1:6381/0>]
+
+You can also get an array of all the clients (master + slaves):
+
+    client = Redis.new(master_name: "master1", sentinels: [{host: "localhost", port: 26379}, {host: "localhost", port: 26380}])
+    client.all_clients
+    # => [#<Redis client v3.0.7 for redis://127.0.0.1:6379/0>, #<Redis client v3.0.7 for redis://127.0.0.1:6380/0>, #<Redis client v3.0.7 for redis://127.0.0.1:6381/0>]
+
 ## Example
 
 Start redis master server, listen on port 16379

data/Rakefile

@@ -16,4 +16,12 @@ RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
+task :console do
+  require 'irb'
+  require 'irb/completion'
+  require 'redis-sentinel'
+  ARGV.clear
+  IRB.start
+end
+
 task :default => :spec

data/lib/redis-sentinel.rb

@@ -1,2 +1,3 @@
 require "redis-sentinel/version"
 require "redis-sentinel/client"
+require "redis-sentinel/redis"

data/lib/redis-sentinel/client.rb

@@ -87,6 +87,36 @@ class Redis::Client
       end
     end
 
+    def discover_slaves
+      while true
+        try_next_sentinel
+
+        begin
+          slaves_info = current_sentinel.sentinel("slaves", @master_name)
+          @slaves = slaves_info.map do |info|
+            info = Hash[*info]
+            ::Redis.new :host => info['ip'], :port => info['port'], :driver => info[:driver]
+          end
+
+          break
+        rescue Redis::CommandError => e
+          raise unless e.message.include?("IDONTKNOW")
+        rescue Redis::CannotConnectError
+          # failed to connect to current sentinel server
+        end
+      end
+    end
+
+    def slaves
+      discover_slaves
+      @slaves
+    end
+
+    def all_clients
+      clients = slaves
+      clients.unshift ::Redis.new @options
+    end
+
     def disconnect_with_sentinels
       current_sentinel.client.disconnect if current_sentinel
       disconnect_without_sentinels
@@ -140,8 +170,8 @@ class Redis::Client
         else
           uri = URI.parse(opts)
           sentinel_options << {
-            host: uri.host,
-            port: uri.port
+            :host => uri.host,
+            :port => uri.port
           }
         end
       end

data/lib/redis-sentinel/redis.rb

@@ -0,0 +1,13 @@
+require "redis"
+
+class Redis
+  class_eval do
+    def slaves
+      client.slaves
+    end
+
+    def all_clients
+      client.all_clients
+    end
+  end
+end

data/lib/redis-sentinel/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Sentinel
-    VERSION = "1.4.3"
+    VERSION = "1.4.4"
   end
 end

data/spec/redis-sentinel/client_spec.rb

@@ -12,11 +12,17 @@ describe Redis::Client do
     ]
   end
 
+  let(:slaves_reply) do
+    [
+      ["ip", "slave-0", "port", "6379"],
+      ["ip", "slave-1", "port", "6380"],
+      ["ip", "slave-2", "port", "6381"]
+    ]
+  end
+
   subject { Redis::Client.new(:master_name => "master", :master_password => "foobar",
                               :sentinels => sentinels) }
 
-  before { allow(Redis).to receive(:new).and_return(current_sentinel) }
-
   context "new instances" do
     it "should parse sentinel options" do
       expect(subject.instance_variable_get(:@sentinels_options)).to eq [
@@ -58,6 +64,8 @@ describe Redis::Client do
   end
 
   context "#try_next_sentinel" do
+    before { allow(Redis).to receive(:new).and_return(current_sentinel) }
+
     it "returns next sentinel server" do
       expect(subject.try_next_sentinel).to eq current_sentinel
     end
@@ -122,6 +130,32 @@ describe Redis::Client do
     end
   end
 
+  context "#discover_slaves" do
+    before do
+      allow(subject).to receive(:try_next_sentinel)
+      allow(subject).to receive(:refresh_sentinels_list)
+      allow(subject).to receive(:current_sentinel).and_return(current_sentinel)
+      expect(current_sentinel).to receive(:sentinel).with("slaves", "master").and_return(slaves_reply)
+
+      slaves = slaves_reply.map do |info|
+        info = Hash[*info]
+        double("Redis", :host => info['ip'], :port => info['port'])
+      end
+
+      allow(Redis).to receive(:new).and_return(*slaves)
+    end
+
+    it "discovers slaves correctly" do
+      slaves = subject.slaves
+
+      expect(slaves.size).to eq 3
+      3.times do |i|
+        expect(slaves[i].host).to eq "slave-#{i.to_s}"
+        expect(slaves[i].port.to_i).to eq (6379 + i)
+      end
+    end
+  end
+
   context "#auto_retry_with_timeout" do
     context "no failover reconnect timeout set" do
       subject { Redis::Client.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -122,6 +122,7 @@ files:
 - lib/em-synchrony/redis-sentinel.rb
 - lib/redis-sentinel.rb
 - lib/redis-sentinel/client.rb
+- lib/redis-sentinel/redis.rb
 - lib/redis-sentinel/version.rb
 - redis-sentinel.gemspec
 - spec/redis-sentinel/client_spec.rb