From 986aec5dbbdfb578945e706cbe6a54c4f06640e5 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Thu, 17 Apr 2008 23:49:03 +0100
Subject: Refactor Dispatcher callbacks to remove unnecessary Dependencies
 checks in production environment.

---
 railties/lib/console_app.rb | 4 ++--
 railties/lib/initializer.rb | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb
index c7673642ec..88e7962b43 100644
--- a/railties/lib/console_app.rb
+++ b/railties/lib/console_app.rb
@@ -24,7 +24,7 @@ end
 def reload!
   puts "Reloading..."
   dispatcher = ActionController::Dispatcher.new($stdout)
-  dispatcher.cleanup_application(true)
-  dispatcher.prepare_application(true)
+  dispatcher.cleanup_application
+  dispatcher.reload_application
   true
 end
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 18af73fc89..b5bf9266f5 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -135,6 +135,9 @@ module Rails
 
       load_application_initializers
 
+      # Prepare dispatcher callbacks and run 'prepare' callbacks
+      prepare_dispatcher
+
       # the framework is now fully initialized
       after_initialize
 
@@ -442,6 +445,12 @@ module Rails
       end
     end
 
+    def prepare_dispatcher
+      require 'dispatcher' unless defined?(::Dispatcher)
+      Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
+      Dispatcher.new(RAILS_DEFAULT_LOGGER).send :run_callbacks, :prepare_dispatch
+    end
+
   end
 
   # The Configuration class holds all the parameters for the Initializer and
-- 
cgit v1.2.3