aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-09-05 14:58:34 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-09-05 14:58:34 +0200
commit227ee2ecb46f1609938a83ed82abde1a45ebe2eb (patch)
tree49e523792a1446a9b5dd1416489ed5af666f0a9b /activerecord
parentde0e7507de826bf77fd57cc2a51e27388cb62ff7 (diff)
downloadrails-227ee2ecb46f1609938a83ed82abde1a45ebe2eb.tar.gz
rails-227ee2ecb46f1609938a83ed82abde1a45ebe2eb.tar.bz2
rails-227ee2ecb46f1609938a83ed82abde1a45ebe2eb.zip
Use a more sensible resolution on the new millisecond benchmarks
Diffstat (limited to 'activerecord')
-rwxr-xr-xactiverecord/lib/active_record/base.rb2
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index cd66844dae..907495a416 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1313,7 +1313,7 @@ module ActiveRecord #:nodoc:
if logger && logger.level <= log_level
result = nil
seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
- logger.add(log_level, "#{title} (#{'%.2f' % (seconds * 1000)}ms)")
+ logger.add(log_level, "#{title} (#{'%.1f' % (seconds * 1000)}ms)")
result
else
yield
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index a3cb6f3214..7c37916367 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -149,7 +149,7 @@ module ActiveRecord
def log_info(sql, name, seconds)
if @logger && @logger.debug?
- name = "#{name.nil? ? "SQL" : name} (#{sprintf("%.2f", seconds * 1000)}ms)"
+ name = "#{name.nil? ? "SQL" : name} (#{sprintf("%.1f", seconds * 1000)}ms)"
@logger.debug(format_log_entry(name, sql.squeeze(' ')))
end
end