slyphon-zookeeper 0.8.2-java → 0.8.3-java

data/CHANGELOG

@@ -1,3 +1,16 @@
+v0.8.3 fix NonLocalJump exception in event delivery thread shutdown code
+
+  * hit a corner case where we're waiting for the zkc handle setup
+    and the user decides to shutdown, but before we've had a chance
+    to enter the delivery loop.
+
+  * Cleaned up some nasty code in ZookeeperConstants
+
+  * removed ZookeeperConstants#print_events and ZookeeperConstants#print_states
+
+  * changed EVENT_TYPE_NAMES and EVENT_STATE_NAMES in ZookeeperConstants
+    to use string values instead of symbols
+
 v0.8.2 fix close after a fork()
 
   * The dispatch thread will be dead in this situation, so we need to 

data/ext/c_zookeeper.rb

@@ -135,32 +135,30 @@ class CZookeeper
     end
 
     def setup_event_thread!
-      @event_thread ||= Thread.new do
-        Thread.current.abort_on_exception = true   # remove this once this is confirmed to work
+      @event_thread ||= Thread.new(&method(:_event_thread_body))
+    end
 
-        logger.debug { "event_thread waiting until running: #{@_running}" }
+    def _event_thread_body
+      logger.debug { "event_thread waiting until running: #{@_running}" }
 
-        @start_stop_mutex.synchronize do
-          @running_cond.wait_until { @_running }
+      @start_stop_mutex.synchronize do
+        @running_cond.wait_until { @_running }
 
-          if @_shutting_down
-            logger.error { "event thread saw @_shutting_down, bailing without entering loop" }
-            return
-          end
+        if @_shutting_down
+          logger.error { "event thread saw @_shutting_down, bailing without entering loop" }
+          return
         end
+      end
 
-        logger.debug { "event_thread running: #{@_running}" }
+      logger.debug { "event_thread running: #{@_running}" }
 
-        while true
-          begin
-            _iterate_event_delivery
-          rescue GotNilEventException
-            logger.debug { "#{self.class}##{__method__}: event delivery thread is exiting" }
-            break
-          end
+      while true
+        begin
+          _iterate_event_delivery
+        rescue GotNilEventException
+          logger.debug { "#{self.class}##{__method__}: event delivery thread is exiting" }
+          break
         end
-
-        # TODO: should we try iterating events after this point? to see if any are left?
       end
     end
 

data/lib/zookeeper/constants.rb

@@ -28,56 +28,30 @@ module ZookeeperConstants
   # used to find the name for a numeric event
   # @private
   EVENT_TYPE_NAMES = {
-    1   => :created,
-    2   => :deleted,
-    3   => :changed,
-    4   => :child,
-    -1  => :session,
-    -2  => :notwatching,
+    1   => 'created',
+    2   => 'deleted',
+    3   => 'changed',
+    4   => 'child',
+    -1  => 'session',
+    -2  => 'notwatching',
   }
 
   # used to pretty print the state name
   # @private
   STATE_NAMES = {
-    -112 => :expired_session,
-    -113 => :auth_failed,
-    0    => :closed,
-    1    => :connecting,
-    2    => :associating,
-    3    => :connected,
+    -112 => 'expired_session',
+    -113 => 'auth_failed',
+    0    => 'closed',
+    1    => 'connecting',
+    2    => 'associating',
+    3    => 'connected',
   }
               
-  def print_events
-    puts "ZK events:"
-    ZookeeperConstants::constants.each do |c|
-      puts "\t #{c}" if c =~ /^ZOO..*EVENT$/
-    end
-  end
-
-  def print_states
-    puts "ZK states:"
-    ZookeeperConstants::constants.each do |c|
-      puts "\t #{c}" if c =~ /^ZOO..*STATE$/
-    end
-  end
-
   def event_by_value(v)
-    return unless v
-    ZookeeperConstants::constants.each do |c|
-      next unless c =~ /^ZOO..*EVENT$/
-      if eval("ZookeeperConstants::#{c}") == v
-        return c
-      end
-    end
+    (name = EVENT_TYPE_NAMES[v]) ?  "ZOO_#{name.upcase}_EVENT" : ''
   end
-  
+
   def state_by_value(v)
-    return unless v
-    ZookeeperConstants::constants.each do |c|
-      next unless c =~ /^ZOO..*STATE$/
-      if eval("ZookeeperConstants::#{c}") == v
-        return c
-      end
-    end
+    (name = STATE_NAMES[v]) ?  "ZOO_#{name.upcase}_STATE" : ''
   end
 end

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.8.2'
+  s.version     = '0.8.3'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "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: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -62,7 +62,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -652502054
+        hash: -2196448064
         segments: 
         - 1
         - 0