nofxx-nanite 0.4.1.2 → 0.4.1.15

data/lib/nanite/mapper_proxy.rb

@@ -31,23 +31,23 @@ module Nanite
     # Send request to given agent through the mapper
     def request(type, payload = '', opts = {}, &blk)
       raise "Mapper proxy not initialized" unless identity && options
-      request = Request.new(type, payload, opts)
+      request = Request.new(type, payload, nil, opts)
       request.from = identity
       request.token = Identity.generate
       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])}")
+      Nanite::Log.debug("SEND #{request.to_s([:tags, :target])}")
       amqp.fanout('request', :no_declare => options[:secure]).publish(serializer.dump(request))
     end    
 
     def push(type, payload = '', opts = {})
       raise "Mapper proxy not initialized" unless identity && options
-      push = Push.new(type, payload, opts)
+      push = Push.new(type, payload, nil, opts)
       push.from = identity
       push.token = Identity.generate
       push.persistent = opts.key?(:persistent) ? opts[:persistent] : options[:persistent]
-      Nanite::Log.info("SEND #{push.to_s([:tags, :target])}")
+      Nanite::Log.debug("SEND #{push.to_s([:tags, :target])}")
       amqp.fanout('request', :no_declare => options[:secure]).publish(serializer.dump(push))
     end    
     

data/lib/nanite/{dispatcher.rb → 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)

data/lib/nanite/reaper.rb

@@ -1,23 +1,29 @@
 module Nanite
   class Reaper
-
+    attr_reader :timeouts
     def initialize(frequency=2)
       @timeouts = {}
       EM.add_periodic_timer(frequency) { EM.next_tick { reap } }
     end
 
-    def timeout(token, seconds, &blk)
+    # Add the specified token to the internal timeout hash.
+    # The reaper will then check this instance on every reap.
+    def register(token, seconds, &blk)
       @timeouts[token] = {:timestamp => Time.now + seconds, :seconds => seconds, :callback => blk}
     end
+    
+    def unregister(token)
+      @timeouts.delete(token)
+    end
 
-    def reset_with_autoregister_hack(token,seconds,&blk)
+    # Updates the timeout timestamp for the given token. If the token is
+    # unknown to this reaper instance it will be auto-registered, usually
+    # happening when you have several mappers and not all of them know
+    # this agent yet, but received a ping from it.
+    def update(token, seconds, &blk)
       unless @timeouts[token]
-        timeout(token, seconds, &blk)
+        register(token, seconds, &blk)
       end
-      reset(token)
-    end
-
-    def reset(token)
       @timeouts[token][:timestamp] = Time.now + @timeouts[token][:seconds]
     end
 
@@ -26,12 +32,7 @@ module Nanite
     def reap
       time = Time.now
       @timeouts.reject! do |token, data|
-        if time > data[:timestamp]
-          data[:callback].call
-          true
-        else
-          false
-        end
+        time > data[:timestamp] and data[:callback].call
       end
     end
   end

data/lib/nanite/security/signature.rb

@@ -1,4 +1,4 @@
-if defined?(OpenSSL::PKCS7::PKCS7)
+if RUBY_VERSION < '1.8.7'
   Nanite::PKCS7 = OpenSSL::PKCS7::PKCS7
 else
   Nanite::PKCS7 = OpenSSL::PKCS7

data/lib/nanite/serializer.rb

@@ -1,6 +1,9 @@
 module Nanite
   class Serializer
+    SERIALIZERS = {:json => JSON, :marshal => Marshal, :yaml => YAML}.freeze
 
+    attr_reader :preferred_format
+    
     class SerializationError < StandardError
       attr_accessor :action, :packet
       def initialize(action, packet, serializers, msg = nil)
@@ -11,42 +14,52 @@ module Nanite
     end # SerializationError
 
     # The secure serializer should not be part of the cascading
-    def initialize(preferred_format = :marshal)
-      preferred_format ||= :marshal
-      if preferred_format.to_s == 'secure'
+    def initialize(preferred_format = nil)
+      @preferred_format = preferred_format || :marshal
+      if @preferred_format.to_s == 'secure'
         @serializers = [ SecureSerializer ]
       else
-        preferred_serializer = SERIALIZERS[preferred_format.to_sym]
+        preferred_serializer = SERIALIZERS[@preferred_format.to_sym]
         @serializers = SERIALIZERS.values.clone
         @serializers.unshift(@serializers.delete(preferred_serializer)) if preferred_serializer
       end
     end
 
-    def dump(packet)
-      cascade_serializers(:dump, packet)
+    def dump(packet, format = nil)
+      cascade_serializers(:dump, packet, format)
     end
 
-    def load(packet)
-      cascade_serializers(:load, packet)
+    def load(packet, format = nil)
+      cascade_serializers(:load, packet, format)
     end
 
     private
 
-    SERIALIZERS = {:json => JSON, :marshal => Marshal, :yaml => YAML}.freeze
-
-    def cascade_serializers(action, packet)
+    def cascade_serializers(action, packet, format)
       errors = []
-      @serializers.map do |serializer|
+      determine_serializers(format).map do |serializer|
         begin
-          o = serializer.send(action, packet)
+          serialized = serializer.send(action, packet)
         rescue Exception => e
-          o = nil
+          serialized = nil
           errors << "#{e.message}\n\t#{e.backtrace[0]}"
         end
-        return o if o
+        return serialized if serialized
       end
       raise SerializationError.new(action, packet, @serializers, errors.join("\n"))
     end
-
-  end # Serializer
-end # Nanite
+    
+    def determine_serializers(format)
+      if secure_serialization? and format == :insecure
+        SERIALIZERS.values
+      else
+        @serializers
+      end
+    end
+    
+    def secure_serialization?
+      @preferred_format.to_s == 'secure'
+    end
+    
+  end
+end

data/lib/nanite/state.rb

@@ -55,9 +55,9 @@ module Nanite
       end
     end
     
-    def []=(nanite, hsh)
+    def []=(nanite, attributes)
       log_redis_error("[]=") do
-        update_state(nanite, hsh[:status], hsh[:services], hsh[:tags])
+        update_state(nanite, attributes[:status], attributes[:services], attributes[:tags])
       end
     end
     
@@ -124,8 +124,12 @@ module Nanite
         @redis.set_add("tg-#{name}", tag)
         @redis.set_add("nanitetags", tag)
       end
+      update_status(name, status)
+    end
+
+    def update_status(name, status)
       @redis[name] = status
-      @redis["t-#{name}"] = Time.now.to_i
+      @redis["t-#{name}"] = Time.now.utc.to_i
     end
     
     def list_nanites

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-nanite
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  - 15
+  version: 0.4.1.15
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,19 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-16 00:00:00 -07:00
+date: 2010-03-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 7
+        version: 1.1.7
+  type: :runtime
+  version_requirements: *id002
 description: self assembling fabric of ruby daemons
 email: ezra@engineyard.com
 executables: 
@@ -40,69 +64,47 @@ files:
 - Rakefile
 - TODO
 - lib/nanite.rb
-- lib/nanite
-- lib/nanite/streaming.rb
-- lib/nanite/serializer.rb
+- lib/nanite/log/formatter.rb
+- lib/nanite/agent.rb
+- lib/nanite/local_state.rb
+- lib/nanite/cluster.rb
+- lib/nanite/reaper.rb
+- lib/nanite/config.rb
 - lib/nanite/pid_file.rb
-- lib/nanite/mapper.rb
 - lib/nanite/daemonize.rb
+- lib/nanite/nanite_dispatcher.rb
+- lib/nanite/console.rb
 - lib/nanite/mapper_proxy.rb
-- lib/nanite/security
-- lib/nanite/security/distinguished_name.rb
-- lib/nanite/security/secure_serializer.rb
-- lib/nanite/security/certificate_cache.rb
+- lib/nanite/job.rb
+- lib/nanite/security/rsa_key_pair.rb
+- lib/nanite/security/encrypted_document.rb
 - lib/nanite/security/signature.rb
+- lib/nanite/security/distinguished_name.rb
+- lib/nanite/security/cached_certificate_store_proxy.rb
 - lib/nanite/security/certificate.rb
-- lib/nanite/security/encrypted_document.rb
-- lib/nanite/security/rsa_key_pair.rb
 - lib/nanite/security/static_certificate_store.rb
-- lib/nanite/security/cached_certificate_store_proxy.rb
-- lib/nanite/config.rb
-- lib/nanite/util.rb
-- lib/nanite/log
-- lib/nanite/log/formatter.rb
-- lib/nanite/state.rb
-- lib/nanite/cluster.rb
-- lib/nanite/dispatcher.rb
-- lib/nanite/security_provider.rb
-- lib/nanite/packets.rb
+- lib/nanite/security/certificate_cache.rb
+- lib/nanite/security/secure_serializer.rb
+- lib/nanite/streaming.rb
+- lib/nanite/serializer.rb
+- lib/nanite/log.rb
 - lib/nanite/actor.rb
-- lib/nanite/console.rb
+- lib/nanite/identity.rb
 - lib/nanite/admin.rb
+- lib/nanite/state.rb
+- lib/nanite/util.rb
 - lib/nanite/amqp.rb
-- lib/nanite/agent.rb
-- lib/nanite/local_state.rb
-- lib/nanite/identity.rb
+- lib/nanite/security_provider.rb
 - lib/nanite/actor_registry.rb
-- lib/nanite/log.rb
-- lib/nanite/reaper.rb
-- lib/nanite/job.rb
-- bin/nanite-agent
+- lib/nanite/packets.rb
+- lib/nanite/mapper.rb
 - bin/nanite-admin
+- bin/nanite-agent
 - bin/nanite-mapper
-- spec/util_spec.rb
-- spec/encrypted_document_spec.rb
-- spec/agent_spec.rb
-- spec/certificate_cache_spec.rb
-- spec/cached_certificate_store_proxy_spec.rb
-- spec/dispatcher_spec.rb
-- spec/rsa_key_pair_spec.rb
-- spec/cluster_spec.rb
-- spec/spec_helper.rb
-- spec/actor_registry_spec.rb
-- spec/actor_spec.rb
-- spec/packet_spec.rb
-- spec/local_state_spec.rb
-- spec/static_certificate_store_spec.rb
-- spec/job_spec.rb
-- spec/signature_spec.rb
-- spec/secure_serializer_spec.rb
-- spec/serializer_spec.rb
-- spec/certificate_spec.rb
-- spec/distinguished_name_spec.rb
 has_rdoc: true
 homepage: http://github.com/ezmobius/nanite
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -112,20 +114,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: self assembling fabric of ruby daemons
 test_files: []
 

data/spec/actor_registry_spec.rb

@@ -1,60 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe Nanite::ActorRegistry do
-  
-  class ::WebDocumentImporter
-    include Nanite::Actor
-    expose :import, :cancel
-
-    def import
-      1
-    end
-    def cancel
-      0
-    end
-  end
-
-  module ::Actors
-    class ComedyActor
-      include Nanite::Actor
-      expose :fun_tricks
-      def fun_tricks
-        :rabbit_in_the_hat
-      end
-    end
-  end
-
-  before(:each) do
-    Nanite::Log.stub!(:info)
-    @registry = Nanite::ActorRegistry.new
-  end
-
-  it "should know about all services" do
-    @registry.register(WebDocumentImporter.new, nil)
-    @registry.register(Actors::ComedyActor.new, nil)
-    @registry.services.sort.should == ["/actors/comedy_actor/fun_tricks", "/web_document_importer/cancel", "/web_document_importer/import"]
-  end
-
-  it "should not register anything except Nanite::Actor" do
-    lambda { @registry.register(String.new, nil) }.should raise_error(ArgumentError)
-  end
-
-  it "should register an actor" do
-    importer = WebDocumentImporter.new
-    @registry.register(importer, nil)
-    @registry.actors['web_document_importer'].should == importer
-  end
-
-  it "should log info message that actor was registered" do
-    importer = WebDocumentImporter.new
-    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.actor_for('monkey').should == importer
-  end
-  
-end # Nanite::ActorRegistry