1 files changed, 21 insertions, 10 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb
index 579b5d8a02..29289a76b4 100644
--- a/actionpack/lib/action_dispatch/middleware/reloader.rb
+++ b/actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -1,9 +1,12 @@
 module ActionDispatch
-  # ActionDispatch::Reloader provides to_prepare and to_cleanup callbacks.
-  # These are analogs of ActionDispatch::Callback's before and after
-  # callbacks, with the difference that to_cleanup is not called until the
+  # ActionDispatch::Reloader provides prepare and cleanup callbacks,
+  # intended to assist with code reloading during development.
+  #
+  # Prepare callbacks are run before each request, and cleanup callbacks
+  # after each request. In this respect they are analogs of ActionDispatch::Callback's
+  # before and after callbacks. However, cleanup callbacks are not called until the
   # request is fully complete -- that is, after #close has been called on
-  # the request body. This is important for streaming responses such as the
+  # the response body. This is important for streaming responses such as the
   # following:
   #
   #     self.response_body = lambda { |response, output|
@@ -15,7 +18,10 @@ module ActionDispatch
   # classes before they are unloaded.
   #
   # By default, ActionDispatch::Reloader is included in the middleware stack
-  # only in the development environment.
+  # only in the development environment; specifically, when config.cache_classes
+  # is false. Callbacks may be registered even when it is not included in the
+  # middleware stack, but are executed only when +ActionDispatch::Reloader.prepare!+
+  # or +ActionDispatch::Reloader.cleanup!+ are called manually.
   #
   class Reloader
     include ActiveSupport::Callbacks
@@ -23,8 +29,8 @@ module ActionDispatch
     define_callbacks :prepare, :scope => :name
     define_callbacks :cleanup, :scope => :name
 
-    # Add a preparation callback. Preparation callbacks are run before each
-    # request.
+    # Add a prepare callback. Prepare callbacks are run before each request, prior
+    # to ActionDispatch::Callback's before callbacks.
     def self.to_prepare(*args, &block)
       set_callback(:prepare, *args, &block)
     end
@@ -35,12 +41,14 @@ module ActionDispatch
       set_callback(:cleanup, *args, &block)
     end
 
+    # Execute all prepare callbacks.
     def self.prepare!
-      new(nil).send(:_run_prepare_callbacks)
+      new(nil).run_callbacks :prepare
     end
 
+    # Execute all cleanup callbacks.
     def self.cleanup!
-      new(nil).send(:_run_cleanup_callbacks)
+      new(nil).run_callbacks :cleanup
     end
 
     def initialize(app)
@@ -56,10 +64,13 @@ module ActionDispatch
     end
 
     def call(env)
-      _run_prepare_callbacks
+      run_callbacks :prepare
       response = @app.call(env)
       response[2].extend(CleanupOnClose)
       response
+    rescue Exception
+      run_callbacks :cleanup
+      raise
     end
   end
 end