nogara-redis_failover 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTUwNjhlMWRlZWJkMGRmM2QxMDYzZDFiZGVmYWVmNzE5YWQ1ODJhNw==
+    YmQ1OWI4NmYzNzE5MWMxNjdjY2ZlMmYyZjU3ZWI2NzU4ZDI1OGVhNQ==
   data.tar.gz: !binary |-
-    ZDZhOWUxZmIyMGIwYjI1MDllMGU5ZDUwYWJjN2RhYmExM2Y2YjUxNQ==
-!binary "U0hBNTEy":
+    OTIwZTRmYWExNmUwMDY3MDMxYjgxMDNiYzc2NmU1ZWE0ZjkwMjdjYg==
+SHA512:
   metadata.gz: !binary |-
-    YTJiM2JhZjcyYjk0YmZlMWM1NWI4OThhNmM5MGJkNmRlN2VkN2U2ZmYzMjRj
-    MjVjODgzNDgyMDNjZWRlMTA5ZjY2ODFkOThkMzdjZjdiZDM2OWNjNTg5NjA3
-    YzE2NDVmYzM3YzA3ZmUzY2MwYWIxMTNmZjIwMmUyOGYzYjk4OGI=
+    ZWMxMzNjNTAwMzVkYjNhZjExZDRiZWZjZGE3MTBhZTk0M2YyMDZjN2Y3ZjVk
+    YjI0NjU0ZGMyNTczMWMzOGIyZTlhN2RjMmZhNjA3NWVjNjA4NTQwOTE2MTg2
+    ZWYyNmYxYmRiMWQ3MWUxZWJiZmI2YWE4NDFlOTBhY2NlNjljM2Y=
   data.tar.gz: !binary |-
-    ZjYyMDBiZTVhNzE0M2NhNmNjZjg5NzVlNjczMjc4MjlkM2U0N2M0N2VlZWI3
-    MjU1YzY2OTQzOTkxODJmZmI5NTQ3OTUyOTM0YjcyNjFlNmE3Yjc1ZmU4MTVm
-    NDAxYjk3ZDQ4MWY5MmRkYjQyOWI1ZTM1M2M2MjE3ODY0ZmNlOGQ=
+    M2Q5NzQ0OGFiODVhM2FkYWFhZDdkZGY4ZjNhODkxZGNkMzQzMDljNmUzNWVm
+    ZmE3NGQyYTAxNzY4NWYxMGUzYmYwODY1N2ZjNDFiZjk3NjlhMzk2NDNlNmFl
+    YTBjMDg0MDQyNmJjMWUwODc1NzBkNTkwNDExMjQ4ZmY0ZWY1N2U=

data/README.md

@@ -151,6 +151,7 @@ The full set of options that can be passed to RedisFailover::Client are:
      :max_retries   - max retries for a failure (default 3)
      :safe_mode     - indicates if safe mode is used or not (default true)
      :master_only   - indicates if only redis master is used (default false)
+     :verify_role   - verify the actual role of a redis node before every command (default true)
 
 The RedisFailover::Client also supports a custom callback that will be invoked whenever the list of redis clients changes. Example usage:
 

data/lib/redis_failover/client.rb

@@ -56,6 +56,7 @@ module RedisFailover
     # @option options [Integer] :max_retries max retries for a failure
     # @option options [Boolean] :safe_mode indicates if safe mode is used or not
     # @option options [Boolean] :master_only indicates if only redis master is used
+    # @option options [Boolean] :verify_role verify the actual role of a redis node before every command
     # @note Use either :zkservers or :zk
     # @return [RedisFailover::Client]
     def initialize(options = {})
@@ -241,6 +242,7 @@ module RedisFailover
 
         if tries < @max_retries
           tries += 1
+          free_client
           build_clients
           sleep(RETRY_WAIT_TIME)
           retry
@@ -257,7 +259,7 @@ module RedisFailover
     # @raise [NoMasterError] if no master is available
     def master
       if master = @lock.synchronize { @master }
-        verify_role!(master, :master)
+        verify_role!(master, :master) if @verify_role
         return master
       end
       raise NoMasterError
@@ -271,7 +273,7 @@ module RedisFailover
     def slave
       # pick a slave, if none available fallback to master
       if slave = @lock.synchronize { @slaves.shuffle.first }
-        verify_role!(slave, :slave)
+        verify_role!(slave, :slave) if @verify_role
         return slave
       end
       master
@@ -343,7 +345,7 @@ module RedisFailover
         opts = {:host => host, :port => port}
         opts.update(:db => @db) if @db
         opts.update(:password => @password) if @password
-        client = Redis.new(opts)
+        client = Redis.new(@redis_client_options.merge(opts))
         if @namespace
           client = Redis::Namespace.new(@namespace, :redis => client)
         end
@@ -500,6 +502,11 @@ module RedisFailover
       @max_retries = @retry ? options.fetch(:max_retries, 3) : 0
       @safe_mode = options.fetch(:safe_mode, true)
       @master_only = options.fetch(:master_only, false)
+      @verify_role = options.fetch(:verify_role, true)
+
+      @redis_client_options = Redis::Client::DEFAULTS.keys.each_with_object({}) do |key, hash| 
+        hash[key] = options[key]
+      end
     end
 
     # @return [String] the znode path for the master redis nodes config

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/client_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module RedisFailover
   Client::Redis = RedisStub
+  Client::Redis::Client = Redis::Client
   class ClientStub < Client
     def current_master
       @master
@@ -120,9 +121,11 @@ module RedisFailover
         client.reconnected.should be_true
       end
 
-      it 'properly detects when a node has changed roles' do
-        client.current_master.change_role_to('slave')
-        expect { client.send(:master) }.to raise_error(InvalidNodeRoleError)
+      context 'with :verify_role true' do
+        it 'properly detects when a node has changed roles' do
+          client.current_master.change_role_to('slave')
+          expect { client.send(:master) }.to raise_error(InvalidNodeRoleError)
+        end
       end
 
       it 'raises error for unsupported operations' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nogara-redis_failover
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ryan LeCompte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: redis_failover is a ZooKeeper-based automatic master/slave failover solution