From 834bd23a07a84ff631da1ded37c643a3a371cb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 24 Jul 2010 10:22:22 +0200 Subject: Get rid of instrumenter.elapsed. --- .../lib/active_record/connection_adapters/abstract_adapter.rb | 10 ++-------- activerecord/lib/active_record/log_subscriber.rb | 5 +++++ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 6072481411..c103fcccf7 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -34,10 +34,9 @@ module ActiveRecord include QueryCache include ActiveSupport::Callbacks + attr_accessor :runtime define_callbacks :checkout, :checkin - @@row_even = true - def initialize(connection, logger = nil) #:nodoc: @active = nil @connection, @logger = connection, logger @@ -199,15 +198,10 @@ module ActiveRecord def log(sql, name) name ||= "SQL" - instrumenter = ActiveSupport::Notifications.instrumenter - - result = instrumenter.instrument("sql.active_record", + ActiveSupport::Notifications.instrument("sql.active_record", :sql => sql, :name => name, :connection_id => object_id) do yield end - @runtime += instrumenter.elapsed - - result rescue Exception => e message = "#{e.class.name}: #{e.message}: #{sql}" @logger.debug message if @logger diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb index 278e192e59..d7b99d796d 100644 --- a/activerecord/lib/active_record/log_subscriber.rb +++ b/activerecord/lib/active_record/log_subscriber.rb @@ -6,6 +6,7 @@ module ActiveRecord end def sql(event) + connection.runtime += event.duration return unless logger.debug? name = '%s (%.1fms)' % [event.payload[:name], event.duration] @@ -25,6 +26,10 @@ module ActiveRecord @odd_or_even = !@odd_or_even end + def connection + ActiveRecord::Base.connection + end + def logger ActiveRecord::Base.logger end -- cgit v1.2.3