0
@@ -35,7 +35,15 @@ module Merb
0
   module GlobalHelpers; end
0
   
0
   class << self
0
-    attr_accessor :exiting
0
+    attr_reader :exiting
0
+
0
+    def exiting=(bool)
0
+      Extlib.exiting = bool
0
+      if bool && Extlib.const_defined?("Pooling") && Extlib::Pooling.scavenger
0
+        Extlib::Pooling.scavenger.wakeup
0
+      end
0
+      @exiting = bool
0
+    end
0
 
0
     # Merge environment settings
0
     # Can allow you to have a "localdev" that runs like your "development"

0
@@ -1,5 +1,11 @@
0
 require 'rubygems/dependency'
0
 
0
+module Gem
0
+  class Dependency
0
+    attr_accessor :require_block
0
+  end
0
+end
0
+
0
 module Kernel
0
   
0
   # Keep track of all required dependencies. 
0
@@ -11,8 +17,10 @@ module Kernel
0
   # @return <Gem::Dependency> Dependency information
0
   #
0
   # @api private
0
-  def track_dependency(name, *ver)
0
+  def track_dependency(name, *ver, &blk)
0
     dep = Gem::Dependency.new(name, ver)
0
+    dep.require_block = blk
0
+    
0
     existing = Merb::BootLoader::Dependencies.dependencies.find { |d| d.name == dep.name }
0
     if existing
0
       index = Merb::BootLoader::Dependencies.dependencies.index(existing)
0
@@ -38,12 +46,12 @@ module Kernel
0
   #   forcing a dependency to load immediately.
0
   #
0
   # @return <Gem::Dependency> The dependency information.
0
-  def dependency(name, *ver)
0
+  def dependency(name, *ver, &blk)
0
     immediate = ver.last.is_a?(Hash) && ver.pop[:immediate]
0
     if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies)
0
-      load_dependency(name, *ver)
0
+      load_dependency(name, *ver, &blk)
0
     else
0
-      track_dependency(name, *ver)
0
+      track_dependency(name, *ver, &blk)
0
     end
0
   end
0
 
0
@@ -63,12 +71,16 @@ module Kernel
0
   #   as a library.
0
   #
0
   # @return <Gem::Dependency> The dependency information.
0
-  def load_dependency(name, *ver)
0
+  def load_dependency(name, *ver, &blk)
0
     dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, *ver)
0
     gem(dep)
0
   rescue Gem::LoadError
0
   ensure
0
-    require dep.name
0
+    if block = blk || dep.require_block
0
+      block.call
0
+    else
0
+      require dep.name
0
+    end
0
     Merb.logger.info!("loading gem '#{dep.name}' ...")
0
     return dep # ensure needs explicit return
0
   end

0
@@ -111,6 +111,7 @@ module Merb
0
         # In daemonized mode or not, support HUPing the process to
0
         # restart it.
0
         Merb.trap('HUP') do
0
+          Merb.exiting = true
0
           stop
0
           Merb.logger.warn! "Exiting port #{port} on #{Process.pid}\n"
0
           exit_process
0
@@ -118,6 +119,7 @@ module Merb
0
 
0
         # ABRTing the process will kill it, and it will not be respawned.
0
         Merb.trap('ABRT') do
0
+          Merb.exiting = true
0
           stopped = stop(128)
0
           Merb.logger.warn! "Exiting port #{port}\n" if stopped
0
           exit_process(128)