majordomo 0.0.1 → 0.0.2

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/examples/sample_client.rb

@@ -1,17 +1,17 @@
-
 # Majordomo Protocol client example. Uses the mdcli API to hide all MDP aspects
 # Author : Mark Wotton <mark@ninjablocks.com>, modelled on python
 # version by Min RK <benjaminrk@gmail.com>
 
 require 'majordomo'
- 
+
 client = Majordomo::Client.new("tcp://localhost:5773", true)
 count = 0
 while count < 100000
   request = "Hello world"
   begin
     warn "sending"
-    reply = client.mdp_send("echo", request)
+    reply = client.send_and_receive("echo", request)
+    warn "Time out!" unless reply
   rescue => e
     warn e
     warn e.backtrace

data/examples/sample_worker.rb

@@ -4,7 +4,7 @@ require 'majordomo'
 worker = Majordomo::Worker.new "tcp://localhost:5773", "echo", true
 reply = nil
 while true
-  request = worker.recv(reply)
+  request = worker.receive_and_send(reply)
   break unless request
   puts "got a request: #{request}"
   reply = request # Echo is complex… :-)

data/lib/MDP.rb

@@ -7,6 +7,5 @@ module MDP
   W_WORKER    = 'MDPW01'
 
   C_CLIENT    = 'MDPC01'
-  
-  
+
 end

data/lib/majordomo/client.rb

@@ -10,57 +10,47 @@ Based on Java example by Arkadiusz Orzechowski
 require 'ffi-rzmq'
 
 class Majordomo::Client
-  def initialize broker, verbose=false
+
+  def initialize(broker, verbose=false)
     @broker = broker
     @verbose = verbose
     @ctx = ZMQ::Context.new
     @poller = ZMQ::Poller.new
     @retries = 3
     @timeout = 2500
-    reconnect_to_broker()
+    reconnect_to_broker
   end
 
-  # Connect or reconnect to broker
-  def reconnect_to_broker
-    if @client
-      @poller.unregister(@client)
-      @client.close()
-    end
-    @client = @ctx.socket(ZMQ::REQ)
-    @client.setsockopt(ZMQ::LINGER, 0)
-    @client.connect(@broker)
-    @poller.register(@client, ZMQ::POLLIN)
-    warn "I: connecting to broker at #{@broker}…" if @verbose
-  end
-  
   # Send request to broker and get reply by hook or crook.
   # Takes ownership of request message and destroys it when sent.
   # Returns the reply message or None if there was no reply.
-  def mdp_send  service, request
+  def send_and_receive  service, request
     request = [Majordomo::C_CLIENT, service, request]
-    warn "I: send request to '#{service}' service: #{request}"    if @verbose
+    log "I: send request to '#{service}' service: #{request}"
     reply = nil
     retries = @retries
     while retries > 0
-      warn request
       @client.send_strings(request)
       begin
         items = @poller.poll(@timeout)
       rescue => e
+        items = 0
         break # interrupted
       end
-      
-      if items
+
+      if items == -1
+        warn "Poller error: Error number #{ZMQ::Util.errno}"
+      elsif items > 0
         msg = []
         @client.recv_strings(msg)
-        warn "I: received reply: #{msg}" if @verbose
-        
+        log "I: received reply: #{msg}"
+
         # Don't try to handle errors, just assert noisily
         raise "expected at least three parts" unless msg.length >= 3
         header, reply_service, *rest = *msg
         raise "bad header #{header}" unless Majordomo::C_CLIENT == header
         raise "bad service #{reply_service}" unless service == reply_service
-        
+
         reply = rest
         break
       else
@@ -76,4 +66,25 @@ class Majordomo::Client
     end
     return reply
   end
+
+  protected
+
+  # Connect or reconnect to broker
+  def reconnect_to_broker
+    if @client
+      @poller = ZMQ::Poller.new
+      @client.close
+    end
+    @client = @ctx.socket(ZMQ::REQ)
+    @client.setsockopt(ZMQ::LINGER, 0)
+    @client.connect(@broker)
+    @poller.register(@client, ZMQ::POLLIN)
+    log "I: connecting to broker at #{@broker}…"
+  end
+
+  def log(s)
+    warn s.inspect if @verbose
+  end
+
+
 end

data/lib/majordomo/version.rb

@@ -1,3 +1,3 @@
 module Majordomo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/majordomo/worker.rb

@@ -11,12 +11,13 @@ require 'ffi-rzmq'
 
 class Majordomo::Worker
   HEARTBEAT_LIVENESS = 3 # 3-5 is reasonable
+
   def initialize(broker, service, verbose=false)
-    @heartbeat_at = 0 # When to send HEARTBEAT (relative to time.time(), so in seconds)
+    @heartbeat_at = 0 # When to send HEARTBEAT 
     @liveness = 0 # How many attempts left
     @heartbeat = 2500 # Heartbeat delay, msecs
     @reconnect = 2500 # Reconnect delay, msecs
-    
+
     # Internal state
     @expect_reply = false # false only at start
 
@@ -24,7 +25,6 @@ class Majordomo::Worker
 
     # Return address, if any
     @reply_to = nil
-    
 
     @broker = broker
     @service = service
@@ -35,20 +35,61 @@ class Majordomo::Worker
     reconnect_to_broker
   end
 
+  def receive_and_send(reply=nil)
+    # Format and send the reply if we were provided one
+    raise "bad reply" unless (reply or not @expect_reply)
+
+    if reply
+      raise "not expecting reply" unless @reply_to
+      log reply.inspect
+      log reply.class
+      reply = [@reply_to, ''] + reply
+      send_to_broker Majordomo::W_REPLY, nil, reply
+
+      @expect_reply = true
+    end
+    while true
+      # Poll socket for a reply, with timeout
+      begin
+        items = @poller.poll(@timeout)
+      rescue => e
+        break # Interrupted
+      end
+      if items
+        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
+  end
+
+  protected
+
   def reconnect_to_broker
     if @worker
       @poller.unregister(@worker)
-      @worker.close()
+      @worker.close
     end
     @worker = @ctx.socket(ZMQ::DEALER)
 
     @worker.setsockopt(ZMQ::LINGER, 0)
     @worker.connect @broker
     @poller.register @worker, ZMQ::POLLIN
-    warn "I: connecting to broker at #{@broker}…" if @verbose
+    log "I: connecting to broker at #{@broker}…"
     # Register service with broker
     send_to_broker Majordomo::W_READY, @service, []
-        
+
     # If liveness hits zero, queue is considered disconnected
     @liveness = HEARTBEAT_LIVENESS
     @heartbeat_at = Time.now + 1e-3 * @heartbeat
@@ -58,99 +99,62 @@ class Majordomo::Worker
 #    @worker.send_string '', ZMQ::SNDMORE
     # ffi-rzmq is a bit weird about copying in raw bytes. need to
     # explode the int first
-    
+
  #   @worker.send_msg
  #   @worker.send_string command, ZMQ::SNDMORE
-    
+
     msg = [option] + msg if option
 
-    
+
     msg = ['', Majordomo::W_WORKER, command] + msg
     if @verbose
-      warn "I: sending #{command} to broker"
+      log "I: sending #{command} to broker"
     end
     @worker.send_strings msg
   end
-  
-  def recv(reply=nil)
-    # Format and send the reply if we were provided one
-    raise "bad reply" unless (reply  or not @expect_reply)
-      
-    if reply
-      raise "not expecting reply" unless @reply_to
-      warn reply.inspect
-      warn reply.class
-      reply = [@reply_to, ''] + reply
-      send_to_broker Majordomo::W_REPLY, nil, reply
-      
-      @expect_reply = true
-    end
-    while true
-      # Poll socket for a reply, with timeout
-      begin
-        items = @poller.poll(@timeout)
-      rescue => e
-        break # Interrupted
-      end    
-      if items
-        if (result = handle_message)
 
-          warn "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
-    logging.warn("W: interrupt received, killing worker…")
-    return nil
-  end
 
   def handle_message
     msg = []
     @worker.recv_strings(msg)
-    warn "I: received message from broker: #{msg} " if @verbose
-        
+    log "I: received message from broker: #{msg} "
+
     @liveness = @HEARTBEAT_LIVENESS
     # Don't try to handle errors, just assert noisily
     raise "expected at least 3 parts" unless msg.length >= 3
-    warn "full message: #{msg}"
+    log "full message: #{msg}"
     empty, header, command, *rest = *msg
 
     raise "no null frame" unless empty == ''
     raise "bad protocol" unless header == Majordomo::W_WORKER
     case command
     when Majordomo::W_REQUEST
-      warn "request body: #{rest}"
+      log "request body: #{rest}"
       # We should pop and save as many addresses as there are
       # up to a null part, but for now, just save one…
       raise "bad message" unless rest.length >= 2
       @reply_to, empty, *body = *rest
-      warn "replyto = #{@reply_to}, body=#{body}"
+      log "replyto = #{@reply_to}, body=#{body}"
       # pop empty
       raise "no null frame" unless empty == ''
-      
+
       return body # We have a request to process
     when Majordomo::W_HEARTBEAT
       # Do nothing for heartbeats
     when Majordomo::W_DISCONNECT
-      @reconnect_to_broker
+      reconnect_to_broker
     else
-      warn "E: invalid input message: #{msg}"
+      log "E: invalid input message: #{msg}"
     end
     return nil # only return message if we found one
   end
 
+
   def reduce_liveness
     @liveness -= 1
     if @liveness == 0
       if @verbose
-        logging.warn("W: disconnected from broker - retrying…")
+        log "W: disconnected from broker - retrying…"
       end
       begin
         time.sleep(1e-3*@reconnect)
@@ -160,4 +164,9 @@ class Majordomo::Worker
       reconnect_to_broker
     end
   end
+
+  def log(s)
+    warn s if @verbose
+  end
+
 end

metadata

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