1 files changed, 13 insertions, 4 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 7da495211d..d2a402aa51 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -22,7 +22,9 @@ module Rails
       initializer :add_builtin_route do |app|
         if Rails.env.development?
           app.routes.append do
-            match '/rails/info/properties' => "rails/info#properties"
+            get '/rails/info/properties' => "rails/info#properties"
+            get '/rails/info/routes'     => "rails/info#routes"
+            get '/rails/info'            => "rails/info#index"
           end
         end
       end
@@ -48,9 +50,9 @@ module Rails
       end
 
       initializer :eager_load! do
-        if config.cache_classes && !(defined?($rails_rake_task) && $rails_rake_task)
+        if config.eager_load
           ActiveSupport.run_load_hooks(:before_eager_load, self)
-          eager_load!
+          config.eager_load_namespaces.each(&:eager_load!)
         end
       end
 
@@ -89,10 +91,17 @@ module Rails
 
       # Disable dependency loading during request cycle
       initializer :disable_dependency_loading do
-        if config.cache_classes && !config.dependency_loading
+        if config.eager_load && config.cache_classes
           ActiveSupport::Dependencies.unhook!
         end
       end
+
+      initializer :activate_queue_consumer do |app|
+        if config.queue == ActiveSupport::Queue
+          app.queue_consumer = config.queue_consumer.start(app.queue, {logger: Rails.logger})
+          at_exit { app.queue_consumer.shutdown }
+        end
+      end
     end
   end
 end