Revert "Rename Orchestra to Notifications [#3321 state:resolved]"

This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.

5 files changed, 10 insertions, 10 deletions

diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index f3130fa5e8..f4d017b8e5 100644
--- a/actionpack/lib/abstract_controller/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
@@ -47,7 +47,7 @@ module AbstractController
     # Override process_action in the AbstractController::Base
     # to log details about the method.
     def process_action(action)
-      event = ActiveSupport::Notifications.instrument(:process_action,
+      event = ActiveSupport::Orchestra.instrument(:process_action,
                 :controller => self, :action => action) do
         super
       end
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index d30c2625a6..59e24619e3 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -53,7 +53,7 @@ module ActionController #:nodoc:
         return content unless cache_configured?
 
         key = fragment_cache_key(key)
-        event = ActiveSupport::Notifications.instrument(:write_fragment, :key => key) do
+        event = ActiveSupport::Orchestra.instrument(:write_fragment, :key => key) do
           cache_store.write(key, content, options)
         end
 
@@ -66,7 +66,7 @@ module ActionController #:nodoc:
         return unless cache_configured?
 
         key = fragment_cache_key(key)
-        event = ActiveSupport::Notifications.instrument(:read_fragment, :key => key) do
+        event = ActiveSupport::Orchestra.instrument(:read_fragment, :key => key) do
           cache_store.read(key, options)
         end
 
@@ -79,7 +79,7 @@ module ActionController #:nodoc:
         return unless cache_configured?
 
         key = fragment_cache_key(key)
-        event = ActiveSupport::Notifications.instrument(:fragment_exist?, :key => key) do
+        event = ActiveSupport::Orchestra.instrument(:fragment_exist?, :key => key) do
           cache_store.exist?(key, options)
         end
 
@@ -110,7 +110,7 @@ module ActionController #:nodoc:
         key = fragment_cache_key(key) unless key.is_a?(Regexp)
         message = nil
 
-        event = ActiveSupport::Notifications.instrument(:expire_fragment, :key => key) do
+        event = ActiveSupport::Orchestra.instrument(:expire_fragment, :key => key) do
           if key.is_a?(Regexp)
             message = "Expired fragments matching: #{key.source}"
             cache_store.delete_matched(key, options)
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 0cf245360a..4fb154470f 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -64,7 +64,7 @@ module ActionController #:nodoc:
           return unless perform_caching
           path = page_cache_path(path)
 
-          event = ActiveSupport::Notifications.instrument(:expire_page, :path => path) do
+          event = ActiveSupport::Orchestra.instrument(:expire_page, :path => path) do
             File.delete(path) if File.exist?(path)
           end
 
@@ -78,7 +78,7 @@ module ActionController #:nodoc:
           return unless perform_caching
           path = page_cache_path(path)
 
-          event = ActiveSupport::Notifications.instrument(:cache_page, :path => path) do
+          event = ActiveSupport::Orchestra.instrument(:cache_page, :path => path) do
             FileUtils.makedirs(File.dirname(path))
             File.open(path, "wb+") { |f| f.write(content) }
           end
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index d02feb5e1e..0f64c23649 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -27,7 +27,7 @@ module ActionView
     end
 
     def render(view, locals, &block)
-      ActiveSupport::Notifications.instrument(:render_template, :identifier => identifier) do
+      ActiveSupport::Orchestra.instrument(:render_template, :identifier => identifier) do
         method_name = compile(locals, view)
         view.send(method_name, locals, &block)
       end.result
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 1e13e21419..495b431307 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -630,7 +630,7 @@ class FragmentCachingTest < ActionController::TestCase
     fragment_computed = false
 
     listener = []
-    ActiveSupport::Notifications.register listener
+    ActiveSupport::Orchestra.register listener
 
     buffer = 'generated till now -> '
     @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
@@ -641,7 +641,7 @@ class FragmentCachingTest < ActionController::TestCase
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
   ensure
-    ActiveSupport::Notifications.unregister listener
+    ActiveSupport::Orchestra.unregister listener
   end
 
 end