diff options
author | José Valim <jose.valim@gmail.com> | 2009-10-15 18:06:15 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-10-15 18:06:15 -0300 |
commit | 8b340ab2f62bac2af9d5917e296bb4101530282a (patch) | |
tree | 576a6c21ec003b05f8a4e23e671077136208db58 /actionpack/lib/action_controller/caching | |
parent | 02b76862e1ff8ceccb3cd48922ac178462e14892 (diff) | |
download | rails-8b340ab2f62bac2af9d5917e296bb4101530282a.tar.gz rails-8b340ab2f62bac2af9d5917e296bb4101530282a.tar.bz2 rails-8b340ab2f62bac2af9d5917e296bb4101530282a.zip |
Revert "Rename Orchestra to Notifications [#3321 state:resolved]"
This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.
Diffstat (limited to 'actionpack/lib/action_controller/caching')
-rw-r--r-- | actionpack/lib/action_controller/caching/fragments.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_controller/caching/pages.rb | 4 |
2 files changed, 6 insertions, 6 deletions
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 |