1 files changed, 22 insertions, 14 deletions

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index fc7d205a6f..df2853498a 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -20,12 +20,6 @@ module Rails
         end
       end
 
-      initializer :add_to_prepare_blocks do
-        config.to_prepare_blocks.each do |block|
-          ActionDispatch::Reloader.to_prepare(&block)
-        end
-      end
-
       initializer :add_builtin_route do |app|
         if Rails.env.development?
           app.routes.append do
@@ -38,14 +32,22 @@ module Rails
         build_middleware_stack
       end
 
-      initializer :run_prepare_callbacks do
-        ActionDispatch::Reloader.prepare!
-      end
-
       initializer :define_main_app_helper do |app|
         app.routes.define_mounted_helper(:main_app)
       end
 
+      initializer :add_to_prepare_blocks do
+        config.to_prepare_blocks.each do |block|
+          ActionDispatch::Reloader.to_prepare(&block)
+        end
+      end
+
+      # This needs to happen before eager load so it happens
+      # in exactly the same point regardless of config.cache_classes
+      initializer :run_prepare_callbacks do
+        ActionDispatch::Reloader.prepare!
+      end
+
       initializer :eager_load! do
         if config.cache_classes && !$rails_rake_task
           ActiveSupport.run_load_hooks(:before_eager_load, self)
@@ -53,15 +55,21 @@ module Rails
         end
       end
 
+      # All initialization is done, including eager loading in production
       initializer :finisher_hook do
         ActiveSupport.run_load_hooks(:after_initialize, self)
       end
 
-      # Force routes to be loaded just at the end and add it to to_prepare callbacks
-      # This needs to be after the finisher hook to ensure routes added in the hook
-      # are still loaded.
+      # Set app reload just after the finisher hook to ensure
+      # paths added in the hook are still loaded.
+      initializer :set_clear_dependencies_hook, :group => :all do |app|
+        ActionDispatch::Reloader.to_cleanup(&app.app_reloader_hook)
+      end
+
+      # Set app reload just after the finisher hook to ensure
+      # routes added in the hook are still loaded.
       initializer :set_routes_reloader do |app|
-        reloader = lambda { app.routes_reloader.execute_if_updated }
+        reloader = app.routes_reloader_hook
         reloader.call
         ActionDispatch::Reloader.to_prepare(&reloader)
       end