2 files changed, 19 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index a0e5d6a5a5..8e0e28c362 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -487,5 +487,16 @@ module Rails
         Rails::Generators.options.deep_merge! config.generators.options
       end
     end
+
+    # For each framework, search for instrument file with Orchestra hooks.
+    #
+    initializer :load_orchestra_instrumentation do
+      config.frameworks.each do |framework|
+        begin
+          require "#{framework}/instrument"
+        rescue LoadError => e
+        end
+      end
+    end
   end
 end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 322590f108..3d9ae46786 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -290,6 +290,14 @@ module Rails
       end
     end
 
+    # Allows Orchestra queue to be modified.
+    #
+    #   config.orchestra.queue = MyNewQueue.new
+    #
+    def orchestra
+      ActiveSupport::Orchestra
+    end
+
     class Generators #:nodoc:
       attr_accessor :aliases, :options, :colorize_logging