nogara-redis_failover 1.0.2 → 1.0.4

data/Changes.md

@@ -1,3 +1,8 @@
+1.0.2
+-----------
+- Reopen client if an ZK::Exceptions::InterruptedSession occurs (#50, mauricio)
+- Insert the "root_znode" path before "master_redis_node_manager_lock" and expose via accessor (#52, jzaleski)
+
 1.0.1
 -----------
 - Bumped required dependency on ZK gem. ZK 1.7.4 fixes a critical bug with locking (see https://github.com/slyphon/zk/issues/54)

data/lib/redis_failover/client.rb

@@ -36,6 +36,12 @@ module RedisFailover
       end
     end
 
+    def call(command, &block)
+      method = command[0]
+      args = command[1..-1]
+      dispatch(method, *args, &block)
+    end
+
     # Creates a new failover redis client.
     #
     # @param [Hash] options the options used to initialize the client instance
@@ -123,7 +129,7 @@ module RedisFailover
 
     # @return [String] a string representation of the client
     def inspect
-      "#<RedisFailover::Client (master: #{master_name}, slaves: #{slave_names})>"
+      "#<RedisFailover::Client (db: #{@db.to_i}, master: #{master_name}, slaves: #{slave_names})>"
     end
     alias_method :to_s, :inspect
 
@@ -317,7 +323,7 @@ module RedisFailover
       logger.debug("Fetched nodes: #{nodes.inspect}")
 
       nodes
-    rescue Zookeeper::Exceptions::InheritedConnectionError => ex
+    rescue Zookeeper::Exceptions::InheritedConnectionError, ZK::Exceptions::InterruptedSession => ex
       logger.debug { "Caught #{ex.class} '#{ex.message}' - reopening ZK client" }
       @zk.reopen
       retry

data/lib/redis_failover/node_manager.rb

@@ -459,6 +459,11 @@ module RedisFailover
       "#{@root_znode}/nodes"
     end
 
+    # @return [String] root path for current node manager lock
+    def current_lock_path
+      "#{@root_znode}/master_redis_node_manager_lock"
+    end
+
     # @return [String] the znode path used for performing manual failovers
     def manual_failover_path
       ManualFailover.path(@root_znode)
@@ -631,7 +636,7 @@ module RedisFailover
 
     # Executes a block wrapped in a ZK exclusive lock.
     def with_lock
-      @zk_lock ||= @zk.locker('master_redis_node_manager_lock')
+      @zk_lock ||= @zk.locker(current_lock_path)
 
       begin
         @zk_lock.lock!(true)

data/lib/redis_failover/version.rb

@@ -1,3 +1,3 @@
 module RedisFailover
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/redis_failover.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('redis', ['>= 2.2', '< 4'])
   gem.add_dependency('redis-namespace')
   gem.add_dependency('multi_json', '~> 1')
-  gem.add_dependency('zk', ['>= 1.7.4', '< 1.8'])
+  gem.add_dependency('zk', ['>= 1.7.4', '< 1.9'])
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')

data/spec/client_spec.rb

@@ -54,6 +54,25 @@ module RedisFailover
         called.should be_true
       end
 
+    describe '#inspect' do
+      it 'should always include db' do
+        opts = {:zkservers => 'localhost:1234'}
+        client = ClientStub.new(opts)
+        client.inspect.should match('<RedisFailover::Client \(db: 0,')
+        db = '5'
+        opts.merge!(:db => db)
+        client = ClientStub.new(opts)
+        client.inspect.should match("<RedisFailover::Client \\(db: #{db},")
+      end
+    end
+
+    describe '#call' do
+      it 'should dispatch :call messages to correct method' do
+        client.should_receive(:dispatch).with(:foo, *['key'])
+        client.call([:foo, 'key'])
+      end
+    end
+
       context 'with :master_only false' do
         it 'routes read operations to a slave' do
           called = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nogara-redis_failover
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -75,7 +75,7 @@ dependencies:
         version: 1.7.4
     - - <
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         version: 1.7.4
     - - <
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: redis_failover is a ZooKeeper-based automatic master/slave failover solution