@@ -33,6 +33,10 @@ opts = OptionParser.new do |opts| opts.on("--initrb FILE", "Path to agent initialization file (NANITE_ROOT/init.rb by default)") do |initrb| options[:initrb] = initrb end + + opts.on("--single-threaded", "Run all operations in one thread") do + options[:single_threaded] = true + end end opts.parse! bin/nanite-agent @@ -52,6 +52,8 @@ module Nanite # services : list of services provided by this agent, by default # all methods exposed by actors are listed # + # single_threaded: Run all operations in one thread + # # Connection options: # # vhost : AMQP broker vhost that should be used lib/nanite/agent.rb @@ -17,7 +17,7 @@ module Nanite meth ||= :index actor = registry.actor_for(prefix) - @evmclass.defer(lambda { + operation = lambda do begin intermediate_results_proc = lambda { |*args| self.handle_intermediate_results(actor, meth, deliverable, *args) } args = [ deliverable.payload ] @@ -26,13 +26,21 @@ module Nanite rescue Exception => e handle_exception(actor, meth, deliverable, e) end - }, lambda { |r| + end + + callback = lambda do |r| if deliverable.kind_of?(Request) r = Result.new(deliverable.token, deliverable.reply_to, r, identity) amq.queue(deliverable.reply_to, :no_declare => options[:secure]).publish(serializer.dump(r)) end - r - }) + r # For unit tests + end + + if @options[:single_threaded] + @evmclass.next_tick { callback.call(operation.call) } + else + @evmclass.defer(operation, callback) + end end protected lib/nanite/dispatcher.rb ebf578bbaa3313f6f3a2d5c6e4a6793a6fc407b0 raphael simon.raphael@gmail.com http://github.com/ezmobius/nanite/commit/6f94559a90dd16aef75e425b6d821d0f220935d1 6f94559a90dd16aef75e425b6d821d0f220935d1 2009-05-27T14:37:29-07:00 2009-05-27T14:37:29-07:00 Added ability to run all operations in the same thread (useful if actors need to use code that is not thread safe such as ActiveRecord). 3a315c998a9f1b98e212aeea61e9c89b32fe5223 raphael simon.raphael@gmail.com