Ensure that eager_load actually takes place just after the middleware stack is built by using another pattern.

Also create a engine_blank_point initializer to ensure any :before or :after hooks defined inside engines won't move the configuration initializers to other places.

1 files changed, 8 insertions, 2 deletions

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 03bc270c81..9d04f1ce38 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -35,8 +35,14 @@ module Rails
         app
       end
 
-      initializer :finisher_hook do |app|
-        ActiveSupport.run_load_hooks(:after_initialize, app)
+      initializer :eager_load! do
+        if config.cache_classes && !$rails_rake_task
+          railties.all(&:eager_load!)
+        end
+      end
+
+      initializer :finisher_hook do
+        ActiveSupport.run_load_hooks(:after_initialize, self)
       end
 
       # Disable dependency loading during request cycle