aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
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_view
parentf2d276fefdd620f18bb9fe3524ae9db6da70621d (diff)
downloadrails-3990310a2bedd0dff5753e3e9b1282e686cff0cc.tar.gz
rails-3990310a2bedd0dff5753e3e9b1282e686cff0cc.tar.bz2
rails-3990310a2bedd0dff5753e3e9b1282e686cff0cc.zip
Use underscore in notification namespaces.
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/render/partials.rb4
-rw-r--r--actionpack/lib/action_view/render/rendering.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 4459ef6124..67a8ee4472 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -215,12 +215,12 @@ module ActionView
options = @options
if @collection
- ActiveSupport::Notifications.instrument("actionview.render_collection",
+ ActiveSupport::Notifications.instrument("action_view.render_collection",
:path => @path, :count => @collection.size) do
render_collection
end
else
- content = ActiveSupport::Notifications.instrument("actionview.render_partial",
+ content = ActiveSupport::Notifications.instrument("action_view.render_partial",
:path => @path) do
render_partial
end
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 578cfe1177..2fdfad694d 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -93,7 +93,7 @@ module ActionView
def _render_template(template, layout = nil, options = {})
locals = options[:locals] || {}
- content = ActiveSupport::Notifications.instrument("actionview.render_template",
+ content = ActiveSupport::Notifications.instrument("action_view.render_template",
:identifier => template.identifier, :layout => (layout ? layout.identifier : nil)) do
template.render(self, locals)
end
@@ -109,7 +109,7 @@ module ActionView
end
def _render_layout(layout, locals, &block)
- ActiveSupport::Notifications.instrument("actionview.render_layout",
+ ActiveSupport::Notifications.instrument("action_view.render_layout",
:identifier => layout.identifier) do
layout.render(self, locals){ |*name| _layout_for(*name, &block) }
end