diff options
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 459b05413c..18891a28ce 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -258,8 +258,6 @@ module ActiveRecord class AbstractAdapter @@row_even = true - include Benchmark - def initialize(connection, logger = nil) # :nodoc: @connection, @logger = connection, logger @runtime = 0 @@ -397,9 +395,9 @@ module ActiveRecord if block_given? if @logger and @logger.level <= Logger::INFO result = nil - bm = measure { result = yield } - @runtime += bm.real - log_info(sql, name, bm.real) + seconds = Benchmark.realtime { result = yield } + @runtime += seconds + log_info(sql, name, seconds) result else yield |