nanite 0.4.1.13 → 0.4.1.14

data/lib/nanite.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'logger'
 require 'yaml'
 require 'openssl'
+require 'fileutils'
 
 $:.unshift File.dirname(__FILE__)
 require 'nanite/amqp'
@@ -39,7 +40,7 @@ require 'nanite/security/static_certificate_store'
 require 'nanite/serializer'
 
 module Nanite
-  VERSION = '0.4.1.13' unless defined?(Nanite::VERSION)
+  VERSION = '0.4.1.14' unless defined?(Nanite::VERSION)
 
   class MapperNotRunning < StandardError; end
 

data/lib/nanite/agent.rb

@@ -183,7 +183,6 @@ module Nanite
       Nanite::Log.debug("RECV #{packet.to_s}")
       case packet
       when Advertise
-        Nanite::Log.info("RECV #{packet.to_s}") unless Nanite::Log.level == :debug
         advertise_services
       when Request, Push
         if @security && !@security.authorize(packet)
@@ -193,14 +192,11 @@ module Nanite
             amq.queue(packet.reply_to, :no_declare => options[:secure]).publish(serializer.dump(r))
           end
         else
-          Nanite::Log.info("RECV #{packet.to_s([:from, :tags])}") unless Nanite::Log.level == :debug
           dispatcher.dispatch(packet)
         end
       when Result
-        Nanite::Log.info("RECV #{packet.to_s([])}") unless Nanite::Log.level == :debug
         @mapper_proxy.handle_result(packet)
       when IntermediateMessage
-        Nanite::Log.info("RECV #{packet.to_s([])}") unless Nanite::Log.level == :debug
         @mapper_proxy.handle_intermediate_result(packet)
       end
     end

data/lib/nanite/amqp.rb

@@ -1,5 +1,18 @@
 class MQ
   class Queue
+    
+    # Monkey patch to add :no_declare => true for new queue objects. See the
+    # explanation for MQ::Exchange#initialize below.
+    def initialize mq, name, opts = {}
+      @mq = mq
+      @opts = opts
+      @bindings ||= {}
+      @mq.queues[@name = name] ||= self
+      @mq.callback{
+      @mq.send Protocol::Queue::Declare.new({ :queue => name,
+                                              :nowait => true }.merge(opts))
+      } unless opts[:no_declare]
+    end
     # Asks the broker to redeliver all unacknowledged messages on a
     # specifieid channel. Zero or more messages may be redelivered.
     #
@@ -48,8 +61,8 @@ module Nanite
         :insist => options[:insist] || false,
         :retry => options[:retry] || 5,
         :connection_status => options[:connection_callback] || proc {|event| 
-          Nanite::Log.debug("CONNECTED to MQ") if event == :connected
-          Nanite::Log.debug("DISCONNECTED from MQ") if event == :disconnected
+          Nanite::Log.debug("Connected to MQ") if event == :connected
+          Nanite::Log.debug("Disconnected from MQ") if event == :disconnected
         }
       })
       MQ.new(connection)

data/lib/nanite/cluster.rb

@@ -83,7 +83,7 @@ module Nanite
           nanites.update_status(ping.identity, ping.status)
           reaper.update(ping.identity, agent_timeout + 1) { nanite_timed_out(ping.identity) }
         else
-          packet = Advertise.new
+          packet = Advertise.new(nil, ping.identity)
           Nanite::Log.debug("SEND #{packet.to_s} to #{ping.identity}")
           amq.queue(ping.identity).publish(serializer.dump(packet))
         end

data/lib/nanite/nanite_dispatcher.rb

@@ -32,7 +32,7 @@ module Nanite
       callback = lambda do |r|
         if deliverable.kind_of?(Request)
           r = Result.new(deliverable.token, deliverable.reply_to, r, identity)
-          Nanite::Log.info("SEND #{r.to_s([])}")
+          Nanite::Log.debug("SEND #{r.to_s([])}")
           amq.queue(deliverable.reply_to, :no_declare => options[:secure]).publish(serializer.dump(r))
         end
         r # For unit tests

data/lib/nanite/packets.rb

@@ -350,9 +350,11 @@ module Nanite
   # when worker initially comes online to advertise
   # it's services
   class Advertise < Packet
-
-    def initialize(size=nil)
+    attr_accessor :target
+    
+    def initialize(size = nil, target = nil)
       @size = size
+      @target = target
     end
     
     def self.json_create(o)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanite
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.13
+  version: 0.4.1.14
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency