diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-13 00:41:04 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-13 01:19:23 +0100 |
commit | da5978c22374b8a3b15a421ff4920e0940435253 (patch) | |
tree | e9a94394f0ce7455cd0f955ede80e0b5f5f573b0 /actionpack/lib/action_view | |
parent | 8d78a82d797bf8809acb1d2ebb30cf81488ac99c (diff) | |
download | rails-da5978c22374b8a3b15a421ff4920e0940435253.tar.gz rails-da5978c22374b8a3b15a421ff4920e0940435253.tar.bz2 rails-da5978c22374b8a3b15a421ff4920e0940435253.zip |
Add subscriber for ActionPack and move all logging inside it.
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/railtie.rb | 11 | ||||
-rw-r--r-- | actionpack/lib/action_view/railties/subscriber.rb | 24 | ||||
-rw-r--r-- | actionpack/lib/action_view/template/text.rb | 2 |
3 files changed, 35 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb index a90e0636b9..e368aab825 100644 --- a/actionpack/lib/action_view/railtie.rb +++ b/actionpack/lib/action_view/railtie.rb @@ -1,2 +1,11 @@ require "action_view" -require "rails"
\ No newline at end of file +require "rails" + +module ActionView + class Railtie < Rails::Railtie + plugin_name :action_view + + require "action_view/railties/subscriber" + subscriber ActionView::Railties::Subscriber.new + end +end
\ No newline at end of file diff --git a/actionpack/lib/action_view/railties/subscriber.rb b/actionpack/lib/action_view/railties/subscriber.rb new file mode 100644 index 0000000000..803f19379c --- /dev/null +++ b/actionpack/lib/action_view/railties/subscriber.rb @@ -0,0 +1,24 @@ +module ActionView + module Railties + class Subscriber < Rails::Subscriber + def render_template(event) + message = "Rendered #{from_rails_root(event.payload[:identifier])}" + message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout] + message << (" (%.1fms)" % event.duration) + info(message) + end + alias :render_partial :render_template + alias :render_collection :render_template + + def logger + ActionController::Base.logger + end + + protected + + def from_rails_root(string) + string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "") + end + end + end +end
\ No newline at end of file diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb index 67e086d8bd..2abb352d4e 100644 --- a/actionpack/lib/action_view/template/text.rb +++ b/actionpack/lib/action_view/template/text.rb @@ -13,7 +13,7 @@ module ActionView #:nodoc: end def identifier - self + 'text template' end def inspect |