lib/merb-core/dispatch/worker.rb @@ -544,9 +544,6 @@ module Merb @rakefiles += rakefiles end - - - end end lib/merb-core.rb @@ -18,6 +18,7 @@ module Merb autoload :Router, "merb-core/dispatch/router" autoload :SessionMixin, "merb-core/dispatch/session" autoload :Test, "merb-core/test" + autoload :Worker, "merb-core/dispatch/worker" end # Require this rather than autoloading it so we can be sure the default template lib/merb-core/autoload.rb @@ -611,6 +611,14 @@ class Merb::BootLoader::ChooseAdapter < Merb::BootLoader end end +class Merb::BootLoader::StartWorkerThread < Merb::BootLoader + + # Choose the Rack adapter/server to use and set Merb.adapter. + def self.run + Merb::Worker.new + end +end + class Merb::BootLoader::RackUpApplication < Merb::BootLoader # Setup the Merb Rack App or read a rackup file located at # Merb::Config[:rackup] with the same syntax as the lib/merb-core/bootloader.rb @@ -1,6 +1,22 @@ module Merb # Module that is mixed in to all implemented controllers. module ControllerMixin + + # Enqueu a block to run in a background thread outside of the request + # response dispatch + # + # ==== Parameters + # takes a block to run later + # + # ==== Example + # run_later do + # SomeBackgroundTask.run + # end + # + def run_later(&blk) + Merb::Dispatcher.work_queue << blk + end + # Renders the block given as a parameter using chunked encoding. # # ==== Parameters lib/merb-core/controller/mixins/controller.rb @@ -6,6 +6,12 @@ class Merb::Dispatcher attr_accessor :use_mutex @@mutex = Mutex.new + @@work_queue = Queue.new + + def work_queue + @@work_queue + end + Merb::Dispatcher.use_mutex = ::Merb::Config[:use_mutex] # This is where we grab the incoming request REQUEST_URI and use that in lib/merb-core/dispatch/dispatcher.rb 8ceb03e11d386feadfa9dd47b57d72c99e36ee6a Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ff42997e2a50613d37c40012b4cec623c3cc2fd5 ff42997e2a50613d37c40012b4cec623c3cc2fd5 2008-06-23T21:13:05-07:00 2008-06-23T21:13:05-07:00 Added Merb::Worker. You can now add a block to be run in a separate thread from your merb controllers with the run_later method run_later do SomeBackgroundTask.run end The block gets pushed onto a thread safe Queue in the Dispatcher and a Merb::Worker class has a thread that loops over items in the queue and calls the block. The work goes to sleep when the queue is empty and wakes up when items are added to the queue 2d01ce2d4e363690d014714cff3431d2f71b17d0 Ezra Zygmuntowicz ez@engineyard.com