redis-sentinel 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8dcd61b9af8824d1cb674236c251562a8c1a7b
-  data.tar.gz: 988dee4fc0381fd9dbf01a7712e5245cff9043d0
+  metadata.gz: 13e25cdba4cbb9a679bc1510df3733769f269084
+  data.tar.gz: d73c7b49c1056871ec68faa8eb49d6cc6c201eb4
 SHA512:
-  metadata.gz: 0c75234935cac8fb1076495c432e0066ed865ed46910a66ba6b20fe9a2e3e166b79138f51d8fa96d0c18fe4505c501591a8c8a64294ce8a4f767ea6117cb6689
-  data.tar.gz: ccbdd5ef1b55d557857ee33918ff95e3e756b21264b00320940995c1e8f823f632f8a55db941981b4b031f7dacdd32a2ae9aba781fade7b49c8647d447d3e2cd
+  metadata.gz: 733ae6b08e7176b1ae8009ef6c70a7ec0a02ccfecdae4dc5973912e6fd937a73040e297c4155ff2b9248bcd369b93dedba35b58f87934f8bb34ffa63b2d82cae
+  data.tar.gz: afbcb2c666c307aa7851b1db2b01abfbcf8f1dbabd9f7d9a76805297d450ddbb5657a3ca0723537043bd2c05e6ed5f7ca3c7e8d5f5d3091a1ab6915f25a7c80b

data/.ruby-gemset

@@ -0,0 +1 @@
+redis-sentinel

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.3.0
+
+* Add ability to reconnect all redis sentinel clients
+* Avoid the config gets modified
+* Reconnect if redis suddenly becones read-only
+
 ## 1.2.0
 
 * Add redis synchrony support

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in redis-sentinel.gemspec
 gemspec
+
+gem 'coveralls', require: false

data/README.md

@@ -91,6 +91,12 @@ takes less than 30 seconds.
   become master / Add redis synchrony support
 * [Zachary Anker](https://github.com/zanker) - Add redis authentication
   support
+* [Nick Deteffen](https://github.com/nick-desteffen) - Add ability to
+  reconnect all redis sentinel clients
+* [Carlos Paramio](https://github.com/carlosparamio) - Avoid the config
+  gets modified
+* [Michael Gee](https://github.com/mikegee) - Reconnect if redis suddenly
+  becomes read-only.
 
 Please fork and contribute, any help in making this project better is appreciated!
 

data/Rakefile

@@ -1 +1,19 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require "rake"
+require "rdoc/task"
+require "rspec"
+require "rspec/core/rake_task"
+
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = "spec/**/*_spec.rb"
+end
+
+RSpec::Core::RakeTask.new('spec:progress') do |spec|
+  spec.rspec_opts = %w(--format progress)
+  spec.pattern = "spec/**/*_spec.rb"
+end
+
+task :default => :spec

data/lib/redis-sentinel/client.rb

@@ -5,6 +5,7 @@ class Redis::Client
 
   class_eval do
     def initialize_with_sentinel(options={})
+      options = options.dup # Don't touch my options
       @master_name = fetch_option(options, :master_name)
       @master_password = fetch_option(options, :master_password)
       @sentinels = fetch_option(options, :sentinels)
@@ -78,6 +79,31 @@ class Redis::Client
       end
     end
 
+    def reconnect_with_sentinels
+      redis_sentinels.each do |config, sentinel|
+        sentinel.client.reconnect
+      end
+      reconnect_without_sentinels
+    end
+
+    alias reconnect_without_sentinels reconnect
+    alias reconnect reconnect_with_sentinels
+
+    def call_with_readonly_protection(*args, &block)
+      tries = 0
+      call_without_readonly_protection(*args, &block)
+    rescue Redis::CommandError => e
+      if e.message == "READONLY You can't write against a read only slave."
+        reconnect
+        retry if (tries += 1) < 4
+      else
+        raise
+      end
+    end
+
+    alias call_without_readonly_protection call
+    alias call call_with_readonly_protection
+
   private
 
     def fetch_option(options, key)

data/lib/redis-sentinel/version.rb

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

data/redis-sentinel.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "redis"
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "eventmachine"
   gem.add_development_dependency "em-synchrony"
+  gem.add_development_dependency "hiredis"
 end

data/spec/redis-sentinel/client_spec.rb

@@ -1,7 +1,8 @@
 require "spec_helper"
 
 describe Redis::Client do
-  let(:redis) { mock("Redis", :sentinel => ["remote.server", 8888])}
+  let(:client) { double("Client", :reconnect => true) }
+  let(:redis)  { double("Redis", :sentinel => ["remote.server", 8888], :client => client) }
 
   subject { Redis::Client.new(:master_name => "master", :master_password => "foobar",
                               :sentinels => [{:host => "localhost", :port => 26379},
@@ -170,4 +171,17 @@ describe Redis::Client do
       end
     end
   end
+
+  context "#reconnect" do
+    it "calls reconnect on each sentinel client" do
+      subject.stub(:connect)
+      subject.discover_master
+      subject.send(:redis_sentinels).each do |config, sentinel|
+        sentinel.client.should_receive(:reconnect)
+      end
+
+      subject.reconnect
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require "rspec"
 
+require 'coveralls'
+Coveralls.wear!
+
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require "redis"
 require "redis-sentinel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  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
   built-in redis sentinel
 email:
@@ -75,6 +103,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -115,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: another redis automatic master/slave failover solution for ruby by using
@@ -124,4 +154,3 @@ test_files:
 - spec/redis-sentinel/client_spec.rb
 - spec/redis-sentinel/em_client_spec.rb
 - spec/spec_helper.rb
-has_rdoc: