haredo 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2cff8b9e4c6d2df39d29382b3cc6d1ad1cdf653
-  data.tar.gz: b51c600b77eadf34286f5a10ac7664f7814c7105
+  metadata.gz: 9c008827995252e52b4c23066cb814d27e233bc0
+  data.tar.gz: 99b349df834cb737e4bd292aa950d350660c46fb
 SHA512:
-  metadata.gz: 1fa6921a853aa13fb1bdae3e3712eca4366d22ecd4039034aa2a6fea77976e70427eefcb6af0b0c49d0562668df48d6597330733ea8e78736f75a6b2b2de073a
-  data.tar.gz: 96a79dcc5cce9d2d91f3ba198a4940903e3d11409fb98b0ed5e1340a43da1bdaf4dfbc1390be4f3e691becaa3c4c5fbd6aab1786db98fcd110351650b07e0306
+  metadata.gz: 2911bbf0b72136f6cc4dff07d1f048714bbfec5de36bd33a9b3838be437442a1d3042ff50ae9f91b33a5feac07bae4704a414dbc5077c1b8bf1b1c726001cdb9
+  data.tar.gz: c1fd6b262bea6dd2dc2c73dda042564a24c37e3c9a256bfd2be018f5d3be2b68d094ae5e153048f71668a00e2f9fd0836b0e0f1ec1db0cb93696821d3b723fe6

data/README.md

@@ -54,7 +54,7 @@ class Service < HareDo::Peer
 
   def serve(msg)
     data = msg.headers['i'].to_i + 1
-    send(msg.properties.reply_to, :data => data.to_s)
+    reply(msg, :data => data.to_s)
   end
 
 end
@@ -500,6 +500,12 @@ system:
     user: guest
     password: guest
     port: '5672'
+    ssl:
+      enable: false
+      port: '5671'
+      tls_cert: '/etc/haredo/ssl/cert.pem'
+      tls_key: '/etc/haredo/ssl/key.pem'
+      tls_ca: '/etc/haredo/ssl/cacert.pem'
 daemon:
   queue: 
     name: 'jujifruit'
@@ -525,6 +531,13 @@ daemon:
             user: root
 ```
 
+Notice the SSL section. You have the option of connecting with or without
+SSL. For SSL, you must include the SSL section and specifically set
+<tt>enable</tt> to true. You must also provide the full path to the client cert,
+key and CA cert you generated for the RabbitMQ broker. See
+http://www.rabbitmq.com/ssl.html and http://rubybunny.info/articles/tls.html for
+more information on using SSL.
+
 ### The Listen Queue
 
 The daemon creates a queue using the <tt>queue</tt> entries. The name is given

data/src/lib/haredo/config.rb

@@ -14,7 +14,7 @@ module HareDo
 module Config
 
   def loadConfig(file=nil)
-    @config_file = file || $haredo_default_config_file || HAREDO_DEFAULT_CONFIG_FILE 
+    @config_file = file || $haredo_default_config_file || HAREDO_DEFAULT_CONFIG_FILE    
     @config      = []    
     @config      = YAML.load_file(@config_file)
     @pid_file    = $haredo_default_pid_file || HAREDO_DEFAULT_PID_FILE

data/src/lib/haredo/peer.rb

@@ -2,7 +2,9 @@ require 'syslog'
 require 'bunny'
 require 'haredo/version'
 
-def dump_message(msg)
+def dump_message(msg, name)
+  puts name if name
+
   if msg.properties != nil
     puts '  Headers:'
     msg.properties.each do |k,v|
@@ -97,6 +99,7 @@ class Manager
     @loaded      = {}
     @config      = {}
     @environment = {}
+    @trace       = false
 
     @module_path_prefix = 'haredo/plugins'
   end
@@ -154,8 +157,9 @@ end # module Plugins
 
 class Peer
 
-  attr_reader :queue, :plugins
+  attr_reader :queue, :plugins, :mid
   attr_accessor :timeout, :sleep_interval
+  attr_accessor :trace
 
   def initialize(name=nil)
     # Message identifier
@@ -165,6 +169,7 @@ class Peer
     @timeout        = 1.0
     @sleep_interval = 0.001
     @receive_queue  = {}
+    @trace          = false
 
     # Server attributes
     # The queue name used for listen()
@@ -205,7 +210,7 @@ class Peer
     tls_cert     = ssl['tls_cert']   || ''
     tls_key      = ssl['tls_key']    || ''
     tls_ca_certs = [ssl['tls_ca']]
-    
+
     use_ssl = false
     if ssl.size > 0 and ssl['enable'] == true
       use_ssl = true
@@ -285,7 +290,7 @@ class Peer
 
     rc = @mid
     @mid += 1
-
+    
     if not from.nil?
       properties[:reply_to] = from 
     else
@@ -294,6 +299,10 @@ class Peer
 
     @exchange.publish(data, properties) 
 
+    if @trace == true
+      dump_message(RabbitMQ::Message.new(headers, properties, data), 'send()')
+    end
+
     return rc
   end
 
@@ -347,21 +356,23 @@ class Peer
       if delivery_info != nil
         msg = RabbitMQ::Message.new(delivery_info, properties, payload)
         
-        if msg.headers.has_key?('id')
-          if mid != nil 
-            if msg.headers['id'] == mid
-              # Reply flag must be set
-              if msg.headers['reply'] == 1
-                return msg
-              end
-            end
-          end
-          
-          # Only add to receive queue if we are expecting it
-          if @receive_queue.has_key?
-            @receive_queue[msg.headers['id']] = msg
+        if @trace == true
+          dump_message(msg, 'receive')
+        end
+        
+        if mid != nil 
+          if properties[:correlation_id].to_i == mid.to_i
+            # Reply flag must be set
+            #if msg.headers['reply'] == 1
+            return msg
+            #end
           end
         end
+        
+        # Only add to receive queue if we are expecting it
+        if @receive_queue.has_key?(mid)
+          @receive_queue[msg.headers['id']] = msg
+        end        
       end
 
       if (Time::now.to_f - now) > @timeout
@@ -392,7 +403,10 @@ class Peer
     headers[:reply] = 1
     headers[:id]    = id.to_i
     
-    send(to, :headers => headers, :data => data)
+    properties = {}
+    properties[:correlation_id] = msg.properties.message_id.to_i
+
+    send(to, :headers => headers, :properties => properties, :data => data)
   end
 
   # Defined the queue this service will listen on. Assumes a single-instance
@@ -428,7 +442,7 @@ class Peer
 
     Syslog.notice('listen()')
     
-    listen_queue.subscribe(:block => block, :ack => true) do |info, props, data|
+    listen_queue.subscribe(:block => block, :manual_ack => true) do |info, props, data|
       @channel.acknowledge(info.delivery_tag, false)
       if serve(RabbitMQ::Message.new(info, props, data)) == false
         exit 0

data/src/lib/haredo/version.rb

@@ -4,8 +4,8 @@ module HareDo
 VERSION_MAJ  = '2'
 VERSION_MIN  = '0'
 VERSION_CL   = ''
-VERSION_PL   = '6'
-VERSION      = '2.0.6-1'
-RELEASE_DATE = 'Tue, 15 Oct 2013 13:03:56 -0500'
+VERSION_PL   = '7'
+VERSION      = '2.0.7-1'
+RELEASE_DATE = 'Fri, 07 Nov 2014 13:31:49 -0600'
 
 end # module HareDo

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: haredo
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: src/bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A P2P framework over RabbitMQ
@@ -32,6 +32,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- README.md
+- src/bin/haredo
 - src/lib/haredo/admin/config.rb
 - src/lib/haredo/admin/interface.rb
 - src/lib/haredo/config.rb
@@ -44,8 +46,6 @@ files:
 - src/lib/haredo/service/config.rb
 - src/lib/haredo/service/daemon.rb
 - src/lib/haredo/version.rb
-- src/bin/haredo
-- README.md
 homepage: https://github.com/mikeowens/haredo
 licenses:
 - MIT
@@ -56,17 +56,17 @@ require_paths:
 - src/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple client/server framework using RabbitMQ