slyphon-zookeeper 0.1.0-java → 0.1.4-java

data/Gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gemspec
+
+platforms :mri_18 do
+  gem 'ruby-debug'
+end
+
+
+# vim:ft=ruby

data/ext/zookeeper_base.rb

@@ -57,7 +57,7 @@ class ZookeeperBase < CZookeeper
   # if either of these happen, the user will need to renegotiate a connection via reopen
   def assert_open
     raise ZookeeperException::SessionExpired if state == ZOO_EXPIRED_SESSION_STATE
-    raise ZookeeperException::ConnectionClosed unless connected?
+    raise ZookeeperException::NotConnected   unless connected?
   end
 
   def connected?

data/java/zookeeper_base.rb

@@ -322,7 +322,7 @@ class ZookeeperBase
 
   def assert_open
     # XXX don't know how to check for valid session state!
-    raise ZookeeperException::ConnectionClosed unless connected?
+    raise ZookeeperException::NotConnected unless connected?
   end
 
   KILL_TOKEN = :__kill_token__

data/lib/zookeeper.rb

@@ -138,6 +138,14 @@ class Zookeeper < ZookeeperBase
     super
   end
 
+  def connecting?
+    super
+  end
+
+  def associating?
+    super
+  end
+
 private
   def setup_call(opts)
     req_id = nil
@@ -155,14 +163,6 @@ private
                               :context => call_opts[:watcher_context] }
   end
 
-  def connecting?
-    super
-  end
-
-  def associating?
-    super
-  end
-
   # TODO: Sanitize user mistakes by unregistering watchers from ops that
   # don't return ZOK (except wexists)?  Make users clean up after themselves for now.
   def unregister_watcher(req_id)

data/lib/zookeeper/common.rb

@@ -63,14 +63,23 @@ protected
     hash[:acl] = hash[:acl].map { |acl| ZookeeperACLs::ACL.new(acl) } if hash[:acl]
     
     callback_context = is_completion ? get_completion(hash[:req_id]) : get_watcher(hash[:req_id])
-    callback = is_completion ? callback_context[:callback] : callback_context[:watcher]
-    hash[:context] = callback_context[:context]
 
-    # TODO: Eventually enforce derivation from Zookeeper::Callback
-    if callback.respond_to?(:call)
-      callback.call(hash)
+    # when connectivity with the server is lost, on reconnection it's possible
+    # to receive duplicate responses. If we've already handled a response for a
+    # given req_id, this value will be nil, and we just ignore it.
+    if callback_context
+      callback = is_completion ? callback_context[:callback] : callback_context[:watcher]
+
+      hash[:context] = callback_context[:context]
+
+      # TODO: Eventually enforce derivation from Zookeeper::Callback
+      if callback.respond_to?(:call)
+        callback.call(hash)
+      else
+        # puts "dispatch_next_callback found non-callback => #{callback.inspect}"
+      end
     else
-      # puts "dispatch_next_callback found non-callback => #{callback.inspect}"
+      logger.warn { "Duplicate event received (no handler for req_id #{hash[:req_id]}, event: #{hash.inspect}" }
     end
   end
 

data/lib/zookeeper/constants.rb

@@ -6,6 +6,7 @@ module ZookeeperConstants
   # session state
   ZOO_EXPIRED_SESSION_STATE  = -112
   ZOO_AUTH_FAILED_STATE      = -113
+  ZOO_CLOSED_STATE           = 0
   ZOO_CONNECTING_STATE       = 1
   ZOO_ASSOCIATING_STATE      = 2
   ZOO_CONNECTED_STATE        = 3

data/lib/zookeeper/exceptions.rb

@@ -52,7 +52,10 @@ module ZookeeperExceptions
     class Closing                 < ZookeeperException; end
     class Nothing                 < ZookeeperException; end
     class SessionMoved            < ZookeeperException; end
-    class ConnectionClosed        < ZookeeperException; end  # this is a Ruby client exception
+    
+    # these are Ruby client exceptions
+    class ConnectionClosed        < ZookeeperException; end
+    class NotConnected            < ZookeeperException; end 
     
     def self.by_code(code)
       case code

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.1.0'
+  s.version     = '0.1.4'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 4
+  version: 0.1.4
 platform: java
 authors: 
 - Phillip Pearson
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +00:00
+date: 2011-03-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - Manifest
 - README