zk 1.3.0 → 1.3.1

data/README.markdown

@@ -63,6 +63,12 @@ In addition to all of that, I would like to think that the public API the ZK::Cl
 
 ## NEWS ##
 
+### v1.3.1 ###
+
+* [fix a bug][bug 1.3.1] where a forked client would not have its 'outstanding watches' cleared, so some events would never be delivered
+
+[bug 1.3.1]: https://github.com/slyphon/zk/compare/release/1.3.0...9f68cee958fdaad8d32b6d042bf0a2c9ab5ec9b0
+
 ### v1.3.0 ###
 
 Phusion Passenger and Unicorn users are encouraged to upgrade!

data/RELEASES.markdown

@@ -1,4 +1,19 @@
 This file notes feature differences and bugfixes contained between releases. 
+### v1.3.1 ###
+
+* [fix a bug][bug 1.3.1] where a forked client would not have its 'outstanding watches' cleared, so some events would never be delivered
+
+[bug 1.3.1]: https://github.com/slyphon/zk/compare/release/1.3.0...9f68cee958fdaad8d32b6d042bf0a2c9ab5ec9b0
+
+### v1.3.0 ###
+
+Phusion Passenger and Unicorn users are encouraged to upgrade!
+
+* __fork()__: ZK should now work reliably after a fork() if you call `reopen()` ASAP in the child process (before continuing any ZK work). Additionally, your event-handler (blocks set up with `zk.register`) will still work in the child. You will have to make calls like `zk.stat(path, :watch => true)` to tell ZooKeeper to notify you of events (as the child will have a new session), but everything should work.
+
+* See the fork-handling documentation [on the wiki](http://github.com/slyphon/zk/wiki/Forking).
+
+
 ### v1.2.0 ###
 
 You are __STRONGLY ENCOURAGED__ to go and look at the [CHANGELOG](http://git.io/tPbNBw) from the zookeeper 1.0.0 release

data/lib/zk/event_handler.rb

@@ -54,7 +54,9 @@ module ZK
     def reopen_after_fork!
       logger.debug { "#{self.class}##{__method__} reopening callbacks" }
       @mutex = Monitor.new
+      # XXX: need to test this w/ actor-style callbacks
       @callbacks.values.flatten.each { |cb| cb.reopen_after_fork! if cb.respond_to?(:reopen_after_fork!) }
+      @outstanding_watches.values.each { |set| set.clear }
       nil
     end
 

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Jonathan D. Simms