aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/instrument.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-10-09 09:52:25 -0300
committerJosé Valim <jose.valim@gmail.com>2009-10-15 18:19:25 -0300
commita15e02d44ac2afb27a7e8e652c98a796d271b645 (patch)
tree4c9dabe41390eff440bfa3f24b5a153d644569c9 /actionpack/lib/action_controller/instrument.rb
parentaeaabc6d2d6f9faaa98057f33c0635d8add54461 (diff)
downloadrails-a15e02d44ac2afb27a7e8e652c98a796d271b645.tar.gz
rails-a15e02d44ac2afb27a7e8e652c98a796d271b645.tar.bz2
rails-a15e02d44ac2afb27a7e8e652c98a796d271b645.zip
Unify benchmark APIs.
Diffstat (limited to 'actionpack/lib/action_controller/instrument.rb')
-rw-r--r--actionpack/lib/action_controller/instrument.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/instrument.rb b/actionpack/lib/action_controller/instrument.rb
index 00888c425f..2c87ed7391 100644
--- a/actionpack/lib/action_controller/instrument.rb
+++ b/actionpack/lib/action_controller/instrument.rb
@@ -1,6 +1,8 @@
require 'active_support/orchestra'
ActiveSupport::Orchestra.subscribe(/(read|write|cache|expire|exist)_(fragment|page)\??/) do |event|
- human_name = event.name.to_s.humanize
- ActionController::Base.log("#{human_name} (%.1fms)" % event.duration)
+ if logger = ActionController::Base.logger
+ human_name = event.name.to_s.humanize
+ logger.info("#{human_name} (%.1fms)" % event.duration)
+ end
end