2 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 5776a7bb27..4d038c29f2 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/delegation'
+
 module ActionDispatch
   # Provide callbacks to be executed before and after the request dispatch.
   class Callbacks
@@ -5,10 +7,8 @@ module ActionDispatch
 
     define_callbacks :call, :rescuable => true
 
-    def self.to_prepare(*args, &block)
-      ActiveSupport::Deprecation.warn "ActionDispatch::Callbacks.to_prepare is deprecated. " <<
-        "Please use ActionDispatch::Reloader.to_prepare instead."
-      ActionDispatch::Reloader.to_prepare(*args, &block)
+    class << self
+      delegate :to_prepare, :to_cleanup, :to => "ActionDispatch::Reloader"
     end
 
     def self.before(*args, &block)
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb
index 7624a1871a..f6ab368ad8 100644
--- a/actionpack/lib/action_dispatch/middleware/reloader.rb
+++ b/actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -68,6 +68,9 @@ module ActionDispatch
       response = @app.call(env)
       response[2].extend(CleanupOnClose)
       response
+    rescue Exception
+      _run_cleanup_callbacks
+      raise
     end
   end
 end