aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-04 00:03:56 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-04 00:03:56 +0100
commit3990310a2bedd0dff5753e3e9b1282e686cff0cc (patch)
treee5f6d664d543651a02187c6ab8fc35171d19a6be /actionpack/lib/action_controller/caching
parentf2d276fefdd620f18bb9fe3524ae9db6da70621d (diff)
downloadrails-3990310a2bedd0dff5753e3e9b1282e686cff0cc.tar.gz
rails-3990310a2bedd0dff5753e3e9b1282e686cff0cc.tar.bz2
rails-3990310a2bedd0dff5753e3e9b1282e686cff0cc.zip
Use underscore in notification namespaces.
Diffstat (limited to 'actionpack/lib/action_controller/caching')
-rw-r--r--actionpack/lib/action_controller/caching/fragments.rb2
-rw-r--r--actionpack/lib/action_controller/caching/pages.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index 91f781a44d..a0c5ed797e 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -111,7 +111,7 @@ module ActionController #:nodoc:
end
def instrument_fragment_cache(name, key)
- ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :key => key){ yield }
+ ActiveSupport::Notifications.instrument("action_controller.#{name}", :key => key){ yield }
end
end
end
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 4498abcdbe..5797eeebd6 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -109,7 +109,7 @@ module ActionController #:nodoc:
end
def instrument_page_cache(name, path)
- ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :path => path){ yield }
+ ActiveSupport::Notifications.instrument("action_controller.#{name}", :path => path){ yield }
end
end