diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 20:28:31 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 20:28:31 -0700 |
commit | cfc0ca0516d818bffdd5959ebe415362965d2de0 (patch) | |
tree | 6a111e99a0997fc6745e8b3ef3c1916d6ab7b394 /actionpack/lib/action_view | |
parent | 8ea88c3b74a20b56d39ab820244e0b3806a84169 (diff) | |
parent | 8e1b02fc37ef7404ce6f35d93a956eccf457d572 (diff) | |
download | rails-cfc0ca0516d818bffdd5959ebe415362965d2de0.tar.gz rails-cfc0ca0516d818bffdd5959ebe415362965d2de0.tar.bz2 rails-cfc0ca0516d818bffdd5959ebe415362965d2de0.zip |
Merge pull request #7708 from bdurand/optimize_log_subscribers
Optimize log subscribers to check if the log level is sufficient
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/log_subscriber.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/log_subscriber.rb b/actionpack/lib/action_view/log_subscriber.rb index cc3a871576..fd9a543e0a 100644 --- a/actionpack/lib/action_view/log_subscriber.rb +++ b/actionpack/lib/action_view/log_subscriber.rb @@ -3,10 +3,13 @@ module ActionView # # Provides functionality so that Rails can output logs from Action View. class LogSubscriber < ActiveSupport::LogSubscriber + VIEWS_PATTERN = /^app\/views\//.freeze + def render_template(event) + return unless logger.info? message = " Rendered #{from_rails_root(event.payload[:identifier])}" message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout] - message << (" (%.1fms)" % event.duration) + message << " (#{event.duration.round(1)}ms)" info(message) end alias :render_partial :render_template @@ -19,7 +22,7 @@ module ActionView protected def from_rails_root(string) - string.sub("#{Rails.root}/", "").sub(/^app\/views\//, "") + string.sub("#{Rails.root}/", "").sub(VIEWS_PATTERN, "") end end end |