@@ -37,6 +37,11 @@ opts = OptionParser.new do |opts| opts.on("--single-threaded", "Run all operations in one thread") do options[:single_threaded] = true end + + opts.on("--threadpool COUNT", "Number of threads to run all operations in") do |tps| + options[:threadpool_size] = tps + end + end opts.parse! bin/nanite-agent @@ -8,7 +8,9 @@ module Nanite def register(actor, prefix) raise ArgumentError, "#{actor.inspect} is not a Nanite::Actor subclass instance" unless Nanite::Actor === actor - Nanite::Log.info("Registering #{actor.inspect} with prefix #{prefix.inspect}") + log_msg = "[actor] #{actor.class.to_s}" + log_msg += ", prefix #{prefix}" if prefix && !prefix.empty? + Nanite::Log.info(log_msg) prefix ||= actor.class.default_prefix actors[prefix.to_s] = actor end lib/nanite/actor_registry.rb @@ -54,6 +54,8 @@ module Nanite # # single_threaded: Run all operations in one thread # + # threadpool_size: Number of threads to run operations in + # # Connection options: # # vhost : AMQP broker vhost that should be used @@ -158,7 +160,7 @@ module Nanite actors = @options[:actors] Dir["#{actors_dir}/*.rb"].each do |actor| next if actors && !actors.include?(File.basename(actor, ".rb")) - Nanite::Log.info("loading actor: #{actor}") + Nanite::Log.info("[setup] loading #{actor}") require actor end init_path = @options[:initrb] || File.join(options[:root], 'init.rb') @@ -166,25 +168,27 @@ module Nanite end def receive(packet) + Nanite::Log.debug("RECV #{packet.to_s}") case packet when Advertise - Nanite::Log.debug("handling Advertise: #{packet.inspect}") + Nanite::Log.info("RECV #{packet.to_s}") unless Nanite::Log.level == Logger::DEBUG advertise_services when Request, Push - Nanite::Log.debug("handling Request: #{packet.inspect}") if @security && !@security.authorize(packet) + Nanite::Log.warn("RECV NOT AUTHORIZED #{packet.to_s}") if packet.kind_of?(Request) r = Result.new(packet.token, packet.reply_to, @deny_token, identity) 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 == Logger::DEBUG dispatcher.dispatch(packet) end when Result - Nanite::Log.debug("handling Result: #{packet.inspect}") + Nanite::Log.info("RECV #{packet.to_s([])}") unless Nanite::Log.level == Logger::DEBUG @mapper_proxy.handle_result(packet) when IntermediateMessage - Nanite::Log.debug("handling Intermediate Result: #{packet.inspect}") + Nanite::Log.info("RECV #{packet.to_s([])}") unless Nanite::Log.level == Logger::DEBUG @mapper_proxy.handle_intermediate_result(packet) end end @@ -198,10 +202,9 @@ module Nanite amq.queue(identity, :durable => true).subscribe(:ack => true) do |info, msg| begin info.ack - packet = serializer.load(msg) - receive(packet) + receive(serializer.load(msg)) rescue Exception => e - Nanite::Log.error("Error handling packet: #{e.message}") + Nanite::Log.error("RECV #{e.message}") end end end @@ -231,13 +234,15 @@ module Nanite def un_register unless @unregistered @unregistered = true + Nanite::Log.info("SEND [un_register]") amq.fanout('registration', :no_declare => options[:secure]).publish(serializer.dump(UnRegister.new(identity))) end end def advertise_services - Nanite::Log.debug("advertise_services: #{registry.services.inspect}") - amq.fanout('registration', :no_declare => options[:secure]).publish(serializer.dump(Register.new(identity, registry.services, status_proc.call, self.tags))) + reg = Register.new(identity, registry.services, status_proc.call, self.tags) + Nanite::Log.info("SEND #{reg.to_s}") + amq.fanout('registration', :no_declare => options[:secure]).publish(serializer.dump(reg)) end def parse_uptime(up) lib/nanite/agent.rb @@ -29,19 +29,19 @@ module Nanite case reg when Register if @security.authorize_registration(reg) + Nanite::Log.info("RECV #{reg.to_s}") nanites[reg.identity] = { :services => reg.services, :status => reg.status, :tags => reg.tags } reaper.timeout(reg.identity, agent_timeout + 1) { nanite_timed_out(reg.identity) } callbacks[:register].call(reg.identity, mapper) if callbacks[:register] - Nanite::Log.info("registered: #{reg.identity}, #{nanites[reg.identity].inspect}") else - Nanite::Log.warning("registration of #{reg.inspect} not authorized") + Nanite::Log.warn("RECV NOT AUTHORIZED #{reg.to_s}") end when UnRegister + Nanite::Log.info("RECV #{reg.to_s}") nanites.delete(reg.identity) callbacks[:unregister].call(reg.identity, mapper) if callbacks[:unregister] - Nanite::Log.info("un-registering: #{reg.identity}") else - Nanite::Log.warning("Registration received an invalid packet type: #{reg.class}") + Nanite::Log.warn("RECV [register] Invalid packet type: #{reg.class}") end end @@ -60,6 +60,7 @@ module Nanite begin old_target = request.target request.target = target unless target == 'mapper-offline' + Nanite::Log.info("SEND #{request.to_s([:from, :tags, :target])}") amq.queue(target).publish(serializer.dump(request), :persistent => request.persistent) ensure request.target = old_target @@ -76,7 +77,9 @@ module Nanite nanite[:status] = ping.status reaper.reset_with_autoregister_hack(ping.identity, agent_timeout + 1) { nanite_timed_out(ping.identity) } else - amq.queue(ping.identity).publish(serializer.dump(Advertise.new)) + packet = Advertise.new + Nanite::Log.info("SEND #{packet.to_s} to #{ping.identity}") + amq.queue(ping.identity).publish(serializer.dump(packet)) end end end @@ -84,6 +87,9 @@ module Nanite # forward request coming from agent def handle_request(request) if @security.authorize_request(request) + Nanite::Log.info("RECV #{request.to_s([:from, :target, :tags])}") unless Nanite::Log.level == Logger::DEBUG + Nanite::Log.debug("RECV #{request.to_s}") + intm_handler = lambda do |result, job| result = IntermediateMessage.new(request.token, job.request.from, mapper.identity, nil, result) forward_response(result, request.persistent) @@ -99,12 +105,13 @@ module Nanite forward_response(result, request.persistent) end else - Nanite::Log.warning("request #{request.inspect} not authorized") + Nanite::Log.warn("RECV NOT AUTHORIZED #{request.to_s}") end end # forward response back to agent that originally made the request def forward_response(res, persistent) + Nanite::Log.info("SEND #{res.to_s([:to])}") amq.queue(res.to).publish(serializer.dump(res), :persistent => persistent) end @@ -157,10 +164,10 @@ module Nanite handler = lambda do |ping| begin ping = serializer.load(ping) - Nanite::Log.debug("got heartbeat from #{ping.identity}") if ping.respond_to?(:identity) + Nanite::Log.debug("RECV #{ping.to_s}") if ping.respond_to?(:to_s) handle_ping(ping) rescue Exception => e - Nanite::Log.error("Error handling heartbeat: #{e.message}") + Nanite::Log.error("RECV [ping] #{e.message}") end end hb_fanout = amq.fanout('heartbeat', :durable => true) @@ -174,11 +181,9 @@ module Nanite def setup_registration_queue handler = lambda do |msg| begin - msg = serializer.load(msg) - Nanite::Log.debug("got registration from #{msg.identity}") - register(msg) + register(serializer.load(msg)) rescue Exception => e - Nanite::Log.error("Error handling registration: #{e.message}") + Nanite::Log.error("RECV [register] #{e.message}") end end reg_fanout = amq.fanout('registration', :durable => true) @@ -192,11 +197,9 @@ module Nanite def setup_request_queue handler = lambda do |msg| begin - msg = serializer.load(msg) - Nanite::Log.debug("got request from #{msg.from} of type #{msg.type}") - handle_request(msg) + handle_request(serializer.load(msg)) rescue Exception => e - Nanite::Log.error("Error handling request: #{e.message}") + Nanite::Log.error("RECV [request] #{e.message}") end end req_fanout = amq.fanout('request', :durable => true) @@ -212,7 +215,7 @@ module Nanite when String # backwards compatibility, we assume redis if the configuration option # was a string - Nanite::Log.info("using redis for state storage") + Nanite::Log.info("[setup] using redis for state storage") require 'nanite/state' @nanites = Nanite::State.new(@state) when Hash lib/nanite/cluster.rb @@ -10,6 +10,7 @@ module Nanite @identity = identity @options = options @evmclass = EM + @evmclass.threadpool_size = @options[:threadpool_size].to_i || 20 end def dispatch(deliverable) @@ -31,12 +32,13 @@ 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([])}") amq.queue(deliverable.reply_to, :no_declare => options[:secure]).publish(serializer.dump(r)) end r # For unit tests end - if @options[:single_threaded] + if @options[:single_threaded] || @options[:thread_poolsize] == 1 @evmclass.next_tick { callback.call(operation.call) } else @evmclass.defer(operation, callback) lib/nanite/dispatcher.rb @@ -14,8 +14,6 @@ module Nanite end def process(msg) - Nanite::Log.debug("processing message: #{msg.inspect}") - if job = jobs[msg.token] job.process(msg) lib/nanite/job.rb @@ -30,7 +30,8 @@ module Nanite def level=(loglevel) init() unless @logger loglevel = loglevel.intern if loglevel.is_a?(String) - @logger.info("Setting log level to #{loglevel.to_s.upcase}") + @logger.info("[setup] setting log level to #{loglevel.to_s.upcase}") + @level = loglevel case loglevel when :debug @logger.level = Logger::DEBUG @@ -46,7 +47,7 @@ module Nanite raise ArgumentError, "Log level must be one of :debug, :info, :warn, :error, or :fatal" end end - + # Passes any other method calls on directly to the underlying Logger object created with init. If # this method gets hit before a call to Nanite::Logger.init has been made, it will call # Nanite::Logger.init() with no arguments. lib/nanite/log.rb @@ -68,6 +68,7 @@ module Nanite # broker is restarted. Default is false. Can be overriden on a per-message basis using the request and push methods. # # secure : use Security features of rabbitmq to restrict nanites to themselves + # # prefetch : Sets prefetch (only supported in RabbitMQ >= 1.6) # # Connection options: @@ -123,7 +124,7 @@ module Nanite @amq = start_amqp(@options) @job_warden = JobWarden.new(@serializer) setup_cluster - Nanite::Log.info('starting mapper') + Nanite::Log.info('[setup] starting mapper') setup_queues start_console if @options[:console] && !@options[:daemonize] end @@ -267,11 +268,12 @@ module Nanite def setup_message_queue amq.queue(identity, :exclusive => true).bind(amq.fanout(identity)).subscribe do |msg| begin - msg = serializer.load(msg) - Nanite::Log.debug("got result from #{msg.from}: #{msg.results.inspect}") + msg = serializer.load(msg) + Nanite::Log.debug("RECV #{msg.to_s}") + Nanite::Log.info("RECV #{msg.to_s([:from])}") unless Nanite::Log.level == Logger::DEBUG job_warden.process(msg) rescue Exception => e - Nanite::Log.error("Error handling result: #{e.message}") + Nanite::Log.error("RECV [result] #{e.message}") end end end lib/nanite/mapper.rb @@ -37,6 +37,7 @@ module Nanite request.persistent = opts.key?(:persistent) ? opts[:persistent] : options[:persistent] pending_requests[request.token] = { :intermediate_handler => opts[:intermediate_handler], :result_handler => blk } + Nanite::Log.info("SEND #{request.to_s([:tags, :target])}") amqp.fanout('request', :no_declare => options[:secure]).publish(serializer.dump(request)) end lib/nanite/mapper_proxy.rb @@ -2,58 +2,111 @@ module Nanite # Base class for all Nanite packets, # knows how to dump itself to JSON class Packet + + attr_accessor :size + def initialize raise NotImplementedError.new("#{self.class.name} is an abstract class.") end + def to_json(*a) - { + js = { 'json_class' => self.class.name, 'data' => instance_variables.inject({}) {|m,ivar| m[ivar.sub(/@/,'')] = instance_variable_get(ivar); m } }.to_json(*a) + js = js.chop + ",\"size\":#{js.size}}" + js + end + + # Log representation + def to_s(filter=nil) + res = "[#{ self.class.to_s.split('::').last. + gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2'). + gsub(/([a-z\d])([A-Z])/,'\1_\2'). + downcase }]" + res += " (#{size.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")} bytes)" if size && !size.to_s.empty? + res + end + + # Log friendly name for given agent id + def id_to_s(id) + case id + when /^mapper-/ then 'mapper' + when /^nanite-(.*)/ then Regexp.last_match(1) + else id + end + end + + # Wrap given string to given maximum number of characters per line + def wrap(txt, col=120) + txt.gsub(/(.{1,#{col}})( +|$\n?)|(.{1,#{col}})/, "\\1\\3\n").chomp end + end # packet that means start of a file transfer # operation class FileStart < Packet + attr_accessor :filename, :token, :dest - def initialize(filename, dest, token) + + def initialize(filename, dest, token, size=nil) @filename = filename @dest = dest @token = token + @size = size end def self.json_create(o) i = o['data'] - new(i['filename'], i['dest'], i['token']) + new(i['filename'], i['dest'], i['token'], o['size']) + end + + def to_s + wrap("#{super} <#{token}> #{filename} to #{dest}") end end # packet that means end of a file transfer # operation class FileEnd < Packet + attr_accessor :token, :meta - def initialize(token, meta) + + def initialize(token, meta, size=nil) @token = token @meta = meta + @size = size end def self.json_create(o) i = o['data'] - new(i['token'], i['meta']) + new(i['token'], i['meta'], o['size']) + end + + def to_s + wrap("#{super} <#{token}> meta #{meta}") end end # packet that carries data chunks during a file transfer class FileChunk < Packet + attr_accessor :chunk, :token - def initialize(token, chunk=nil) + + def initialize(token, size=nil, chunk=nil) @chunk = chunk @token = token + @size = size end + def self.json_create(o) i = o['data'] - new(i['token'], i['chunk']) + new(i['token'], o['size'], i['chunk']) + end + + def to_s + "#{super} <#{token}>" end end @@ -71,25 +124,43 @@ module Nanite # target is the target nanite for the request # persistent signifies if this request should be saved to persistent storage by the AMQP broker class Request < Packet + attr_accessor :from, :payload, :type, :token, :reply_to, :selector, :target, :persistent, :tags + DEFAULT_OPTIONS = {:selector => :least_loaded} - def initialize(type, payload, opts={}) + + def initialize(type, payload, size=nil, opts={}) opts = DEFAULT_OPTIONS.merge(opts) - @type = type - @payload = payload - @from = opts[:from] - @token = opts[:token] - @reply_to = opts[:reply_to] - @selector = opts[:selector] - @target = opts[:target] - @persistent = opts[:persistent] - @tags = opts[:tags] || [] + @type = type + @payload = payload + @size = size + @from = opts[:from] + @token = opts[:token] + @reply_to = opts[:reply_to] + @selector = opts[:selector] + @target = opts[:target] + @persistent = opts[:persistent] + @tags = opts[:tags] || [] end + def self.json_create(o) i = o['data'] - new(i['type'], i['payload'], {:from => i['from'], :token => i['token'], :reply_to => i['reply_to'], :selector => i['selector'], - :target => i['target'], :persistent => i['persistent'], :tags => i['tags']}) + new(i['type'], i['payload'], o['size'], { :from => i['from'], :token => i['token'], + :reply_to => i['reply_to'], :selector => i['selector'], + :target => i['target'], :persistent => i['persistent'], + :tags => i['tags'] }) + end + + def to_s(filter=nil) + log_msg = "#{super} <#{token}> #{type}" + log_msg += " from #{id_to_s(from)}" if filter.nil? || filter.include?(:from) + log_msg += " to #{id_to_s(target)}" if target && (filter.nil? || filter.include?(:target)) + log_msg += ", reply_to #{id_to_s(reply_to)}" if reply_to && (filter.nil? || filter.include?(:reply_to)) + log_msg += ", tags #{tags.inspect}" if tags && !tags.empty? && (filter.nil? || filter.include?(:tags)) + log_msg += ", payload #{payload.inspect}" if filter.nil? || filter.include?(:payload) + wrap(log_msg) end + end # packet that means a work push from mapper @@ -105,23 +176,38 @@ module Nanite # target is the target nanite for the request # persistent signifies if this request should be saved to persistent storage by the AMQP broker class Push < Packet + attr_accessor :from, :payload, :type, :token, :selector, :target, :persistent, :tags + DEFAULT_OPTIONS = {:selector => :least_loaded} - def initialize(type, payload, opts={}) + + def initialize(type, payload, size=nil, opts={}) opts = DEFAULT_OPTIONS.merge(opts) - @type = type - @payload = payload - @from = opts[:from] - @token = opts[:token] - @selector = opts[:selector] - @target = opts[:target] - @persistent = opts[:persistent] - @tags = opts[:tags] || [] + @type = type + @payload = payload + @size = size + @from = opts[:from] + @token = opts[:token] + @selector = opts[:selector] + @target = opts[:target] + @persistent = opts[:persistent] + @tags = opts[:tags] || [] end + def self.json_create(o) i = o['data'] - new(i['type'], i['payload'], {:from => i['from'], :token => i['token'], :selector => i['selector'], - :target => i['target'], :persistent => i['persistent'], :tags => i['tags']}) + new(i['type'], i['payload'], o['size'], { :from => i['from'], :token => i['token'], + :selector => i['selector'], :target => i['target'], + :persistent => i['persistent'], :tags => i['tags'] }) + end + + def to_s(filter=nil) + log_msg = "#{super} <#{token}> #{type}" + log_msg += " from #{id_to_s(from)}" if filter.nil? || filter.include?(:from) + log_msg += ", target #{id_to_s(target)}" if target && (filter.nil? || filter.include?(:target)) + log_msg += ", tags #{tags.inspect}" if tags && !tags.empty? && (filter.nil? || filter.include?(:tags)) + log_msg += ", payload #{payload.inspect}" if filter.nil? || filter.include?(:payload) + wrap(log_msg) end end @@ -132,16 +218,28 @@ module Nanite # token is a generated request id that mapper uses to identify replies # to is identity of the node result should be delivered to class Result < Packet + attr_accessor :token, :results, :to, :from - def initialize(token, to, results, from) + + def initialize(token, to, results, from, size=nil) @token = token @to = to @from = from @results = results + @size = size end + def self.json_create(o) i = o['data'] - new(i['token'], i['to'], i['results'], i['from']) + new(i['token'], i['to'], i['results'], i['from'], o['size']) + end + + def to_s(filter=nil) + log_msg = "#{super} <#{token}>" + log_msg += " from #{id_to_s(from)}" if filter.nil? || filter.include?(:from) + log_msg += " to #{id_to_s(to)}" if filter.nil? || filter.include?(:to) + log_msg += " results: #{results.inspect}" if filter.nil? || filter.include?(:results) + wrap(log_msg) end end @@ -153,17 +251,25 @@ module Nanite # token is a generated request id that mapper uses to identify replies # to is identity of the node result should be delivered to class IntermediateMessage < Packet + attr_accessor :token, :messagekey, :message, :to, :from - def initialize(token, to, from, messagekey, message) - @token = token - @to = to - @from = from + + def initialize(token, to, from, messagekey, message, size=nil) + @token = token + @to = to + @from = from @messagekey = messagekey - @message = message + @message = message + @size = size end + def self.json_create(o) i = o['data'] - new(i['token'], i['to'], i['from'], i['messagekey'], i['message']) + new(i['token'], i['to'], i['from'], i['messagekey'], i['message'], o['size']) + end + + def to_s + wrap("#{super} <#{token}> from #{id_to_s(from)}, key #{messagekey}") end end @@ -174,16 +280,27 @@ module Nanite # status is a load of the node by default, but may be any criteria # agent may use to report it's availability, load, etc class Register < Packet + attr_accessor :identity, :services, :status, :tags - def initialize(identity, services, status, tags) - @status = status - @tags = tags + + def initialize(identity, services, status, tags, size=nil) + @status = status + @tags = tags @identity = identity @services = services + @size = size end + def self.json_create(o) i = o['data'] - new(i['identity'], i['services'], i['status'], i['tags']) + new(i['identity'], i['services'], i['status'], i['tags'], o['size']) + end + + def to_s + log_msg = "#{super} #{id_to_s(identity)}" + log_msg += ", services: #{services.join(', ')}" if services && !services.empty? + log_msg += ", tags: #{tags.join(', ')}" if tags && !tags.empty? + wrap(log_msg) end end @@ -191,13 +308,21 @@ module Nanite # # from is sender identity class UnRegister < Packet + attr_accessor :identity - def initialize(identity) + + def initialize(identity, size=nil) @identity = identity + @size = size end + def self.json_create(o) i = o['data'] - new(i['identity']) + new(i['identity'], o['size']) + end + + def to_s + "#{super} #{id_to_s(identity)}" end end @@ -206,26 +331,40 @@ module Nanite # identity is sender's identity # status is sender's status (see Register packet documentation) class Ping < Packet + attr_accessor :identity, :status - def initialize(identity, status) - @status = status + + def initialize(identity, status, size=nil) + @status = status @identity = identity + @size = size end + def self.json_create(o) i = o['data'] - new(i['identity'], i['status']) + new(i['identity'], i['status'], o['size']) + end + + def to_s + "#{super} #{id_to_s(identity)} status #{status}" end + end # packet that is sent by workers to the mapper # when worker initially comes online to advertise # it's services class Advertise < Packet - def initialize + + def initialize(size=nil) + @size = size end + def self.json_create(o) - new + new(o['size']) end + end + end lib/nanite/packets.rb @@ -30,7 +30,7 @@ module Nanite # of these two service tags def initialize(redis) - Nanite::Log.info("initializing redis state: #{redis}") + Nanite::Log.info("[setup] initializing redis state: #{redis}") host, port = redis.split(':') host ||= '127.0.0.1' port ||= '6379' lib/nanite/state.rb @@ -1,6 +1,6 @@ spec = Gem::Specification.new do |s| s.name = 'nanite' - s.version = '0.4.1.1' + s.version = '0.4.1.2' s.platform = Gem::Platform::RUBY s.has_rdoc = true s.extra_rdoc_files = ['README.rdoc', 'LICENSE', 'TODO'] nanite.gemspec @@ -49,14 +49,14 @@ describe Nanite::ActorRegistry do it "should log info message that actor was registered" do importer = WebDocumentImporter.new - Nanite::Log.should_receive(:info).with("Registering #{importer.inspect} with prefix nil") + Nanite::Log.should_receive(:info).with("[actor] #{importer.class.to_s}") @registry.register(importer, nil) end it "should handle actors registered with a custom prefix" do importer = WebDocumentImporter.new @registry.register(importer, 'monkey') - @registry.actors['monkey'].should == importer + @registry.actor_for('monkey').should == importer end end # Nanite::ActorRegistry spec/actor_registry_spec.rb @@ -186,7 +186,12 @@ describe "Agent:" do agent.tags.should include("sample_tag_1") agent.tags.should include("sample_tag_2") end - + + it "for threadpool_size" do + agent = Nanite::Agent.start(:threadpool_size => 5) + agent.dispatcher.evmclass.threadpool_size.should == 5 + end + end describe "Security" do spec/agent_spec.rb @@ -225,7 +225,7 @@ describe Nanite::Cluster do describe "when sending an invalid packet to the registration queue" do it "should log a message statement" do - Nanite::Log.should_receive(:warning).with("Registration received an invalid packet type: Nanite::Ping") + Nanite::Log.logger.should_receive(:warn).with("RECV [register] Invalid packet type: Nanite::Ping") @cluster.register(Nanite::Ping.new(nil, nil)) end end @@ -338,7 +338,7 @@ describe Nanite::Cluster do @reaper = mock("Reaper") Nanite::Reaper.stub!(:new).and_return(@reaper) @cluster = Nanite::Cluster.new(@amq, 32, "the_identity", @serializer, @mapper) - @request = mock("Request", :persistent => true, :target => nil, :target= => nil) + @request = mock("Request", :persistent => true, :target => nil, :target= => nil, :to_s => nil) @target = mock("Target of Request") end @@ -381,9 +381,10 @@ describe Nanite::Cluster do @reaper = mock("Reaper") Nanite::Reaper.stub!(:new).and_return(@reaper) @request_without_target = mock("Request", :target => nil, :token => "Token", - :reply_to => "Reply To", :from => "From", :persistent => true, :identity => "Identity") + :reply_to => "Reply To", :from => "From", :persistent => true, :identity => "Identity", + :payload => "Payload", :to_s => nil) @request_with_target = mock("Request", :target => "Target", :token => "Token", - :reply_to => "Reply To", :from => "From", :persistent => true) + :reply_to => "Reply To", :from => "From", :persistent => true, :payload => "Payload", :to_s => nil) @mapper_with_target = mock("Mapper", :identity => "id") @mapper_without_target = mock("Mapper", :request => false, :identity => @request_without_target.identity) @cluster_with_target = Nanite::Cluster.new(@amq, 32, "the_identity", @serializer, @mapper_with_target) spec/cluster_spec.rb @@ -81,11 +81,6 @@ describe Nanite::JobWarden do Nanite::Log.stub!(:debug) end - it "should log debug message about message to be processed" do - Nanite::Log.should_receive(:debug) - @warden.process(@message) - end - it "should hand over processing to job" do Nanite::Job.stub!(:new).and_return(@job) @job.should_receive(:process).with(@message) spec/job_spec.rb @@ -63,7 +63,7 @@ describe Nanite::Mapper do @mapper = Nanite::Mapper.new({:callbacks => {:register => lambda {|*args|}}}) @mapper.stub!(:setup_queues) @mapper.stub!(:start_amqp) - Nanite::Cluster.should_receive(:new).with(nil, 15, instance_of(String), instance_of(Nanite::Serializer), @mapper, nil, :register => instance_of(Proc)) + Nanite::Cluster.should_receive(:new) run_in_em {@mapper.run} end end spec/mapper_spec.rb @@ -6,7 +6,10 @@ require 'spec' require 'nanite' module SpecHelpers - + + # Initialize logger so it writes to file instead of STDOUT + Nanite::Log.init('test', File.join(File.dirname(__FILE__))) + # Create test certificate def issue_cert test_dn = { 'C' => 'US', spec/spec_helper.rb 75729d53250470386c5679ee329e5e58bc335113 491ae82bc1a18c2c0e44ab6d4667ee00ab7c5799 Chris Gaffney cgaffney@crayoninterface.com http://github.com/ezmobius/nanite/commit/4074f9c70007bedc4ab9ee617b325861ca39e8a9 4074f9c70007bedc4ab9ee617b325861ca39e8a9 2009-08-08T09:55:49-07:00 2009-08-08T09:55:49-07:00 Merge commit 'ezmobius/master' 3b730a5d868261dbeceba96bda201b1423fec2f9 Chris Gaffney cgaffney@crayoninterface.com