@@ -296,26 +296,25 @@ Mongrel on the other hand does not use EventMachine and therefore requires to wr 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 +if defined?(PhusionPassenger) + PhusionPassenger.on_event(:starting_worker_process) do |forked| + if forked + if EM.reactor_running? + EM.stop_event_loop + EM.release_machine + EM.instance_variable_set( '@reactor_running', false ) end + Thread.current[:mq] = nil + AMQP.instance_variable_set('@conn', nil) + end + + th = Thread.current + Thread.new{ + Nanite.start_mapper(:host => 'localhost', :user => 'mapper', :pass => 'testing', :vhost => '/nanite', :log_level => 'info') + } + Thread.stop + end +end ======= Where to put the mapper initialization code depends on the framework and our preference. README.rdoc @@ -66,21 +66,6 @@ module Nanite <meta content='Engineyard' name='author' /> <title>Nanite Control Tower</title> - <!-- Google AJAX Libraries API --> - <script src="http://www.google.com/jsapi"></script> - <script type="text/javascript"> - google.load("jquery", "1"); - </script> - - <script type="text/javascript"> - $(document).ready(function(){ - - // set the focus to the payload field - $("#payload").focus(); - - }); - </script> - <style> body {margin: 0; font-family: verdana; background-color: #fcfcfc;} ul {margin: 0; padding: 0; margin-left: 10px} @@ -137,7 +122,7 @@ module Nanite <div class="section"> #{"No nanites online." if @mapper.cluster.nanites.size == 0} <ul> - #{@mapper.cluster.nanites.map {|k,v| "<li>identity : #{k}<br />load : #{v[:status]}<br />services : #{v[:services].to_a.inspect}</li>" }.join} + #{@mapper.cluster.nanites.map {|k,v| "<li>identity : #{k}<br />load : #{v[:status]}<br />services : #{v[:services].to_a.inspect}<br />tags: #{v[:tags].to_a.inspect}</li>" }.join} </ul> </div> <div id="footer"> lib/nanite/admin.rb @@ -17,7 +17,7 @@ module Nanite # service, so for each service the agent provides, we add the nanite to a SET # of all the nanites that provide said service: # - # /gems/list: { nanite-foobar, nanite-nickelbag, nanite-another } # redis SET + # foo/bar: { nanite-foobar, nanite-nickelbag, nanite-another } # redis SET # # we do that same thing for tags: # some-tag: { nanite-foobar, nanite-nickelbag, nanite-another } # redis SET lib/nanite/state.rb b9f5af0569abf25c43602ade51c1da2964fa98e1 Ezra Zygmuntowicz ez@engineyard.com http://github.com/ezmobius/nanite/commit/2a6d66c01058cc74d2839001057021247009e20c 2a6d66c01058cc74d2839001057021247009e20c 2009-05-28T17:08:37-07:00 2009-05-28T17:08:37-07:00 small doc fixes d2bae7ac63ae000c4669001a622a11411a8a8a18 Ezra Zygmuntowicz ez@engineyard.com