zk-eventmachine 0.1.8 → 0.1.9

data/lib/z_k/z_k_event_machine/client.rb

@@ -6,8 +6,6 @@ module ZK
 
       DEFAULT_TIMEOUT = 10
 
-      attr_reader :client
-
       # Takes same options as ZK::Client::Base
       def initialize(host, opts={})
         @host = host
@@ -26,7 +24,10 @@ module ZK
       # ready for use
       def connect(&blk)
         # XXX: maybe move this into initialize, need to figure out how to schedule it properly
-        @cnx ||= ZookeeperEM::Client.new(@host, DEFAULT_TIMEOUT, event_handler.get_default_watcher_block)
+        @cnx ||= (
+          event_handler.register_state_handler(Zookeeper::ZOO_EXPIRED_SESSION_STATE, &method(:handle_expired_session_state_event!))
+          ZookeeperEM::Client.new(@host, DEFAULT_TIMEOUT, event_handler.get_default_watcher_block)
+        )
         @cnx.on_attached(&blk)
       end
 
@@ -137,6 +138,12 @@ module ZK
       end
 
     protected
+      def handle_expired_session_state_event!(event)
+        exc = ZK::Exceptions::ConnectionLoss.new("Received EXPIRED_SESSION_STATE event: #{event.inspect}")
+        exc.set_backtrace(caller)
+        connection_lost_hook(exc)
+      end
+
       def connection_lost_hook(exc)
         if exc and exc.kind_of?(ZK::Exceptions::ConnectionLoss)
           dfr, @connection_lost_deferred = @connection_lost_deferred, Deferred::Default.new

data/lib/z_k/z_k_event_machine/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module ZKEventMachine
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/spec/z_k/z_k_event_machine/client_spec.rb

@@ -81,6 +81,27 @@ module ZK::ZKEventMachine
           end
         end
       end
+
+      it %[should be called if we get a session expired event] do
+        @zkem.on_connection_lost do |exc|
+          logger.debug { "WIN!" }
+          exc.should be_kind_of(ZK::Exceptions::ConnectionLoss)
+          @zkem.close! { done }
+        end
+
+        em do
+          @zkem.connect do
+            event = flexmock(:event).tap do |ev|
+              ev.should_receive(:node_event?).and_return(false)
+              ev.should_receive(:state_event?).and_return(true)
+              ev.should_receive(:zk=).with_any_args
+              ev.should_receive(:state).and_return(Zookeeper::ZOO_EXPIRED_SESSION_STATE)
+            end
+
+            EM.next_tick { @zkem.event_handler.process(event) }
+          end
+        end
+      end
     end
 
     describe 'get' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-eventmachine
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zk
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ZK client for EventMachine-based (async) applications