redis-sentinel 1.1.4 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e8dcd61b9af8824d1cb674236c251562a8c1a7b
+  data.tar.gz: 988dee4fc0381fd9dbf01a7712e5245cff9043d0
+SHA512:
+  metadata.gz: 0c75234935cac8fb1076495c432e0066ed865ed46910a66ba6b20fe9a2e3e166b79138f51d8fa96d0c18fe4505c501591a8c8a64294ce8a4f767ea6117cb6689
+  data.tar.gz: ccbdd5ef1b55d557857ee33918ff95e3e756b21264b00320940995c1e8f823f632f8a55db941981b4b031f7dacdd32a2ae9aba781fade7b49c8647d447d3e2cd

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.2.0
+
+* Add redis synchrony support
+* Add redis authentication support
+
 ## 1.1.4
 
 * Fix discover_master procedure wich failover_reconnect_wait option

data/README.md

@@ -88,7 +88,9 @@ takes less than 30 seconds.
 * [Donald Plummer](https://github.com/dplummer) - Add wait / timeout for
   redis connection
 * [Rafał Michalski](https://github.com/royaltm) - Ensure promoted slave
-  become master
+  become master / Add redis synchrony support
+* [Zachary Anker](https://github.com/zanker) - Add redis authentication
+  support
 
 Please fork and contribute, any help in making this project better is appreciated!
 

data/lib/em-synchrony/redis-sentinel.rb

@@ -0,0 +1,13 @@
+require 'redis/connection/synchrony' unless defined? Redis::Connection::Synchrony
+require 'redis-sentinel'
+
+class Redis::Client
+  class_eval do
+    private
+    def sleep(seconds)
+      f = Fiber.current
+      EM::Timer.new(seconds) { f.resume }
+      Fiber.yield
+    end
+  end
+end

data/lib/redis-sentinel/client.rb

@@ -6,6 +6,7 @@ class Redis::Client
   class_eval do
     def initialize_with_sentinel(options={})
       @master_name = fetch_option(options, :master_name)
+      @master_password = fetch_option(options, :master_password)
       @sentinels = fetch_option(options, :sentinels)
       @failover_reconnect_timeout = fetch_option(options, :failover_reconnect_timeout)
       @failover_reconnect_wait = fetch_option(options, :failover_reconnect_wait) ||
@@ -70,10 +71,10 @@ class Redis::Client
         end
       end
 
-      if is_down == "1" || runid == '?'
+      if is_down.to_s == "1" || runid == '?'
         raise Redis::CannotConnectError.new("The master: #{@master_name} is currently not available.")
       else
-        @options.merge!(:host => host, :port => port.to_i)
+        @options.merge!(:host => host, :port => port.to_i, :password => @master_password)
       end
     end
 

data/lib/redis-sentinel/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Sentinel
-    VERSION = "1.1.4"
+    VERSION = "1.2.0"
   end
 end

data/redis-sentinel.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "redis"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "eventmachine"
+  gem.add_development_dependency "em-synchrony"
 end

data/spec/redis-sentinel/client_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Redis::Client do
   let(:redis) { mock("Redis", :sentinel => ["remote.server", 8888])}
 
-  subject { Redis::Client.new(:master_name => "master",
+  subject { Redis::Client.new(:master_name => "master", :master_password => "foobar",
                               :sentinels => [{:host => "localhost", :port => 26379},
                                              {:host => "localhost", :port => 26380}]) }
 
@@ -45,25 +45,40 @@ describe Redis::Client do
     it "should update options" do
       redis.should_receive(:sentinel).
             with("is-master-down-by-addr", "remote.server", 8888).once.
-            and_return(["0", "abc"])
+            and_return([0, "abc"])
       subject.discover_master
       expect(subject.host).to eq "remote.server"
       expect(subject.port).to eq 8888
+      expect(subject.password).to eq "foobar"
     end
 
     it "should not update options" do
       redis.should_receive(:sentinel).
             with("is-master-down-by-addr", "remote.server", 8888).twice.
-            and_return(["1", "abc"], ["0", "?"])
+            and_return([1, "abc"], [0, "?"])
       2.times do
         expect do
           subject.discover_master
         end.to raise_error(Redis::CannotConnectError, /currently not available/)
         expect(subject.host).not_to eq "remote.server"
         expect(subject.port).not_to eq 8888
+        expect(subject.password).not_to eq "foobar"
       end
     end
 
+    it "should not use a password" do
+      Redis.should_receive(:new).with({:host => "localhost", :port => 26379})
+      redis.should_receive(:sentinel).with("get-master-addr-by-name", "master")
+      redis.should_receive(:sentinel).with("is-master-down-by-addr", "remote.server", 8888)
+
+      redis = Redis::Client.new(:master_name => "master", :sentinels => [{:host => "localhost", :port => 26379}])
+      redis.discover_master
+
+      expect(redis.host).to eq "remote.server"
+      expect(redis.port).to eq 8888
+      expect(redis.password).to eq nil
+    end
+
     it "should select next sentinel" do
       Redis.should_receive(:new).with({:host => "localhost", :port => 26379})
       redis.should_receive(:sentinel).
@@ -77,6 +92,7 @@ describe Redis::Client do
       subject.discover_master
       expect(subject.host).to eq "remote.server"
       expect(subject.port).to eq 8888
+      expect(subject.password).to eq "foobar"
     end
 
     describe "memoizing sentinel connections" do

data/spec/redis-sentinel/em_client_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+require "em-synchrony/redis-sentinel"
+require "eventmachine"
+
+describe Redis::Client do
+  context "#auto_retry_with_timeout" do
+    subject { described_class.new(:failover_reconnect_timeout => 3,
+                                :failover_reconnect_wait => 0.1) }
+    context "configured wait time" do
+
+      it "uses the wait time and blocks em" do
+        Time.stub(:now).and_return(100, 101, 105)
+        flag = false; EM.next_tick { flag = true }
+        subject.should_receive(:sleep).with(0.1).and_return(0.1)
+        begin
+          subject.auto_retry_with_timeout { raise Redis::CannotConnectError }
+        rescue Redis::CannotConnectError
+        end
+        flag.should be_false
+      end
+
+      it "uses the wait time and doesn't block em" do
+        Time.stub(:now).and_return(100, 101, 105)
+        flag = false; EM.next_tick { flag = true }
+        begin
+          subject.auto_retry_with_timeout { raise Redis::CannotConnectError }
+        rescue Redis::CannotConnectError
+        end
+        flag.should be_true
+      end
+    end
+  end
+
+  around(:each) do |testcase|
+    EM.run do
+      Fiber.new do
+        begin
+          testcase.call
+        ensure
+          EM.stop
+        end
+      end.resume
+    end
+  end
+end

metadata

@@ -1,46 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.1.4
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: another redis automatic master/slave failover solution for ruby by using
@@ -65,38 +88,40 @@ files:
 - example/test.rb
 - example/test_wait_for_failover.rb
 - example/test_wait_for_failover_write.rb
+- lib/em-synchrony/redis-sentinel.rb
 - lib/redis-sentinel.rb
 - lib/redis-sentinel/client.rb
 - lib/redis-sentinel/version.rb
 - redis-sentinel.gemspec
 - spec/redis-sentinel/client_spec.rb
+- spec/redis-sentinel/em_client_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/flyerhzm/redis-sentinel
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: another redis automatic master/slave failover solution for ruby by using
   built-in redis sentinel
 test_files:
 - spec/redis-sentinel/client_spec.rb
+- spec/redis-sentinel/em_client_spec.rb
 - spec/spec_helper.rb
 has_rdoc: