github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Let ApplicationController stay unloaded for as long as possible

Browse Source
This commit is contained in:
David Heinemeier Hansson
2008-11-22 13:24:37 +01:00
parent e50530ca3a
commit a026b4c983
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_controller/dispatcher.rb
View File

@@ -12,8 +12,6 @@ module ActionController
after_dispatch :cleanup_application
end
to_prepare(:load_application_controller) { ApplicationController }
if defined?(ActiveRecord)
after_dispatch :checkin_connections
to_prepare(:activerecord_instantiate_observers) { ActiveRecord::Base.instantiate_observers }
@@ -178,7 +176,7 @@ module ActionController
def failsafe_rescue(exception)
self.class.failsafe_response(@output, '500 Internal Server Error', exception) do
if @controller ||= defined?(::ApplicationController) ? ::ApplicationController : Base
if @controller ||= (::ApplicationController rescue Base)
@controller.process_with_exception(@request, @response, exception).out(@output)
else
raise exception