mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Changed all benchmarking reports to be in milliseconds
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*Edge*
|
||||
|
||||
* Changed benchmarks to be reported in milliseconds [DHH]
|
||||
|
||||
* Connection pooling. #936 [Nick Sieger]
|
||||
|
||||
* Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code! #501 [Andrew White]
|
||||
|
||||
@@ -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} (#{'%.5f' % seconds})")
|
||||
logger.add(log_level, "#{title} (#{'%.2f' % (seconds * 1000)}ms)")
|
||||
result
|
||||
else
|
||||
yield
|
||||
|
||||
@@ -147,10 +147,10 @@ module ActiveRecord
|
||||
@open_transactions -= 1
|
||||
end
|
||||
|
||||
def log_info(sql, name, runtime)
|
||||
def log_info(sql, name, seconds)
|
||||
if @logger && @logger.debug?
|
||||
name = "#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})"
|
||||
@logger.debug format_log_entry(name, sql.squeeze(' '))
|
||||
name = "#{name.nil? ? "SQL" : name} (#{sprintf("%.2f", seconds * 1000)}ms)"
|
||||
@logger.debug(format_log_entry(name, sql.squeeze(' ')))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user