ezmobius-nanite 0.3.0 → 0.4.0

data/README.rdoc

@@ -29,7 +29,8 @@ In your Nanites you can have any number of actor classes.  These actors are like
 in Rails or Merb and this is where you implement your own custom functionality.  An actor looks
 like:
 
-  class Foo < Nanite::Actor
+  class Foo
+    include Nanite::Actor
     expose :bar
     def bar(payload)
       "got payload: #{payload}"
@@ -128,22 +129,22 @@ If you don't have easy_install, install setuptools from http://pypi.python.org/p
 
 and install simplejson, which is needed for the "make" step below.
 
-These instructions assume the latest RabbitMQ release 1.5.1:
+These instructions assume the latest RabbitMQ release 1.5.3:
 
   # Download somewhere
   cd /root
-  wget http://www.rabbitmq.com/releases/rabbitmq-server/v1.5.1/rabbitmq-server-1.5.1.tar.gz
+  wget http://www.rabbitmq.com/releases/rabbitmq-server/v1.5.3/rabbitmq-server-1.5.3.tar.gz
   
   # Go to your erlang lib directory, usually /usr/lib/erlang/lib or:
   cd /usr/local/lib/erlang/lib
   
-  tar -zxf ~/rabbitmq-server-1.5.1.tar.gz
-  cd rabbitmq-server-1.5.1
+  tar -zxf ~/rabbitmq-server-1.5.3.tar.gz
+  cd rabbitmq-server-1.5.3
   make
   
   # There is no "make install" phase.
 
-Be sure to add the /usr/local/lib/erlang/lib/rabbitmq-server-1.5.1/scripts to your $PATH.
+Be sure to add the /usr/local/lib/erlang/lib/rabbitmq-server-1.5.3/scripts to your $PATH.
 
 The following websites may also be useful:
 * RabbitMQ website for the latest info : http://www.rabbitmq.com/download.html
@@ -154,9 +155,9 @@ The following websites may also be useful:
 
 === Install RabbitMQ (Linux .deb)
 
-  wget http://www.rabbitmq.com/releases/rabbitmq-server/v1.5.1/rabbitmq-server_1.5.1-1_all.deb
+  wget http://www.rabbitmq.com/releases/rabbitmq-server/v1.5.3/rabbitmq-server_1.5.3-1_all.deb
   sudo apt-get install logrotate
-  sudo dpkg -i rabbitmq-server_1.5.1-1_all.deb
+  sudo dpkg -i rabbitmq-server_1.5.3-1_all.deb
 
 == Test your installation
 
@@ -282,17 +283,41 @@ Thin is EventMachine-based, so we only need to make sure that the EventMachine r
     until EM.reactor_running?
       sleep 1
     end
-    Nanite.start :mapper => true, :host => 'localhost', :user => 'mapper', :pass => 'testing', :vhost => '/nanite', :log_level => 'info'
+    Nanite.start_mapper(:host => 'localhost', :user => 'mapper', :pass => 'testing', :vhost => '/nanite', :log_level => 'info')
   end
   
 Mongrel on the other hand does not use EventMachine and therefore requires to wrap the start of our mapper
   
   Thread.new do
     EM.run do 
-      Nanite.start :mapper => true, :host => 'localhost', :user => 'mapper', :pass => 'testing', :vhost => '/nanite', :log_level => 'info'
+      Nanite.start_mapper(:host => 'localhost', :user => 'mapper', :pass => 'testing', :vhost => '/nanite', :log_level => 'info')
     end
   end
 
+Using nanite with Passenger:
+
+     current = Thread.current
+     Thread.new do
+       AMQP.start(:host => AMQP_HOST) do
+         current.wakeup
+       end
+     end
+     Thread.stop
+
+     # catch these, stop AMQP, stop eventmachine, and re-throw to
+Mongrel/Passenger's signal traps
+     EM.run do
+       ['INT', 'TERM'].each do |sig|
+         old = trap(sig) do
+           AMQP.stop do
+             EM.stop
+             old.call
+           end
+         end
+       end
+     end
+
+=======
 Where to put the mapper initialization code depends on the framework and our preference. 
 For Rails the canonical place to start our mapper is within nanite.rb (or any other filename you prefer) in config/initalizers.
 In Merb we can use init.rb in config.
@@ -321,7 +346,7 @@ The easiest way to verify it is by starting two separate Erlang shells like this
   $ erl -sname fred
   (fred@odin)1>
 
-  $erl -sname bob
+  $ erl -sname bob
   (bob@odin)1>
 
 And then trying to 'ping' one from the other. In the 'fred' node you can do that like this:

data/Rakefile

@@ -10,7 +10,7 @@ end
 require 'rake/clean'
 
 GEM = "nanite"
-VER = "0.3.0"
+VER = "0.4.0"
 AUTHOR = "Ezra Zygmuntowicz"
 EMAIL = "ezra@engineyard.com"
 HOMEPAGE = "http://github.com/ezmobius/nanite"
@@ -33,7 +33,6 @@ spec = Gem::Specification.new do |s|
   s.bindir       = "bin"
   s.executables  = %w( nanite-agent nanite-mapper nanite-admin )
 
-  s.add_dependency "extlib"
   s.add_dependency('amqp', '>= 0.6.0')
 
   s.require_path = 'lib'

data/TODO

@@ -9,17 +9,16 @@ Ian:
   - Update docs for Agent#start and Mapper#start
   - Update docs in nanite-agent and nanite-mapper
   - Ensure file transfer works
-  - Ensure admin works
   - Check secure stuff still works
   - Check custom status_proc works
-  - Update README
   - Check documentation, only document public methods
-  - no_declare => true in dispatcher.rb?
   - ensure the removal of threaded_actors option doesn't cause shit to block
 
-Points:
+  - Look into using EM deferables for actors dispatch.
+  - Integration specs that spawn a small cluster of nanites
+  - Rename Ping to Status
+  - request/push should take *args for payload?
 
-  - Is exchanges.rb old code?
-  - Removed threaded_actors option as subscribe is async anyway - true?
-  - Wouldn't it be better to blow up if the default serializer doesn't work? We could be cascading with every messages and never know.
-  - What's the point of || 'index' in the dispatcher?
+Maybe:
+  - Make mapper queue durable and Results respect :persistent flag on the request
+  - Add a global result received callback

data/bin/nanite-admin

@@ -48,12 +48,18 @@ opts = OptionParser.new do |opts|
   opts.separator '*'*80
 
   setup_mapper_options(opts, options)
+  
+  opts.on("--thin-debug", "Set the equivalent of the '--debug' flag on the Thin webserver.") do
+    options[:thin_debug] = true
+  end
 end
 
 opts.parse!
 
 EM.run do
-  mapper = Nanite::Mapper.start(options)
-  puts "starting nanite-admin"
-  Rack::Handler::Thin.run(Nanite::Admin.new(mapper), :Port => 4000)
+  Nanite.start_mapper(options)
+  Nanite::Log.info "starting nanite-admin"
+  Rack::Handler::Thin.run(Nanite::Admin.new(Nanite.mapper), :Port => 4000) do
+    Thin::Logging.debug = options[:thin_debug]
+  end
 end

data/bin/nanite-agent

@@ -25,6 +25,24 @@ end
 
 opts.parse!
 
+if ARGV[0] == 'stop'
+  agent = Nanite::Agent.new(options)
+  pid_file = Nanite::PidFile.new(agent.identity, agent.options)
+  unless pid = pid_file.read_pid
+    puts "#{pid_file} not found"
+    exit
+  end
+  puts "Stopping nanite agent #{agent.identity} (pid #{pid})"
+  begin
+    Process.kill('TERM', pid)
+  rescue Errno::ESRCH
+    puts "Process does not exist (pid #{pid})"
+    exit
+  end
+  puts 'Done.'
+  exit
+end
+
 EM.run do
-  Nanite::Agent.start(options)
+  Nanite.start_agent(options)
 end

data/bin/nanite-mapper

@@ -17,6 +17,24 @@ end
 
 opts.parse!
 
+if ARGV[0] == 'stop'
+  mapper = Nanite::Mapper.new(options)
+  pid_file = Nanite::PidFile.new(mapper.identity, mapper.options)
+  unless pid = pid_file.read_pid
+    puts "#{pid_file} not found"
+    exit
+  end
+  puts "Stopping nanite mapper #{mapper.identity} (pid #{pid})"
+  begin
+    Process.kill('TERM', pid)
+  rescue Errno::ESRCH
+    puts "Process does not exist (pid #{pid})"
+    exit
+  end
+  puts 'Done.'
+  exit
+end
+
 EM.run do
-  Nanite::Mapper.start(options)
+  Nanite.start_mapper(options)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ezmobius-nanite
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 -08:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: amqp
   type: :runtime