majordomo 0.0.3 → 0.0.4

data/lib/majordomo/version.rb

@@ -1,3 +1,3 @@
 module Majordomo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/majordomo/worker.rb

@@ -25,12 +25,11 @@ class Majordomo::Worker
 
     # Return address, if any
     @reply_to = nil
-
+    
     @broker = broker
     @service = service
     @verbose = verbose
     @ctx = ZMQ::Context.new
-    @poller = ZMQ::Poller.new
 
     reconnect_to_broker
   end
@@ -55,20 +54,27 @@ class Majordomo::Worker
       rescue => e
         break # Interrupted
       end
-      if items
+      case items
+      when 0
+        # nothing waiting, but not an error
+        log "timed out on poll, reducing liveness"
+        reduce_liveness
+      when -1
+        msg = "error polling socket: errno is #{ZMQ::Util.error_string}"
+        log msg
+        raise msg
+      else
         if (result = handle_message)
-
           log "result from handle_message: |#{result}|"
           return result
         end
-      else
-        reduce_liveness
       end
       # Send HEARTBEAT if it's time
       if Time.now > @heartbeat_at
         send_to_broker(Majordomo::W_HEARTBEAT)
         @heartbeat_at = Time.now + 1e-3*@heartbeat
       end
+      
     end
     log "W: interrupt received, killing worker…"
     return nil
@@ -78,14 +84,18 @@ class Majordomo::Worker
 
   def reconnect_to_broker
     if @worker
-      @poller.unregister(@worker)
+      @poller.deregister_readable @worker
       @worker.close
     end
+    # for some reason, if we don't register a new poller,
+    # we get an error on the next poll. Very mysterious, and this
+    # solution is decidedly suboptimal. FIX
+    @poller = ZMQ::Poller.new
     @worker = @ctx.socket(ZMQ::DEALER)
 
     @worker.setsockopt(ZMQ::LINGER, 0)
     @worker.connect @broker
-    @poller.register @worker, ZMQ::POLLIN
+    @poller.register_readable @worker
     log "I: connecting to broker at #{@broker}…"
     # Register service with broker
     send_to_broker Majordomo::W_READY, @service, []
@@ -116,10 +126,11 @@ class Majordomo::Worker
 
   def handle_message
     msg = []
+
     @worker.recv_strings(msg)
     log "I: received message from broker: #{msg} "
 
-    @liveness = @HEARTBEAT_LIVENESS
+    @liveness = HEARTBEAT_LIVENESS
     # Don't try to handle errors, just assert noisily
     raise "expected at least 3 parts" unless msg.length >= 3
     log "full message: #{msg}"
@@ -138,13 +149,14 @@ class Majordomo::Worker
       # pop empty
       raise "no null frame" unless empty == ''
 
-      return body # We have a request to process
-    when Majordomo::W_HEARTBEAT
+      return body # We have a request to process    when Majordomo::W_HEARTBEAT
       # Do nothing for heartbeats
     when Majordomo::W_DISCONNECT
       reconnect_to_broker
+    when Majordomo::W_HEARTBEAT
+      # pass
     else
-      log "E: invalid input message: #{msg}"
+      log "E: invalid input message: #{command}: #{msg}"
     end
     return nil # only return message if we found one
   end
@@ -157,7 +169,7 @@ class Majordomo::Worker
         log "W: disconnected from broker - retrying…"
       end
       begin
-        time.sleep(1e-3*@reconnect)
+        time.sleep(1*@reconnect)
       rescue => e # KeyboardInterrupt:
         return nil
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: majordomo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &8175960 !ruby/object:Gem::Requirement
+  requirement: &13299660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8175960
+  version_requirements: *13299660
 description: Majordomo for Ruby
 email:
 - mark@ninjablocks.com