diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-11 15:14:52 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-11 15:14:52 +0100 |
commit | c1239e6509d27f88db2fc59189fd9a95333283e1 (patch) | |
tree | c3283f8228b9c6bc8a518a66bb0eca2004519434 /activerecord/lib/active_record/connection_adapters | |
parent | 0a8004efd2136247decfcce83801478ae805d29e (diff) | |
download | rails-c1239e6509d27f88db2fc59189fd9a95333283e1.tar.gz rails-c1239e6509d27f88db2fc59189fd9a95333283e1.tar.bz2 rails-c1239e6509d27f88db2fc59189fd9a95333283e1.zip |
Send the connection in AR notifications to avoid checking out new connections in threads just for logging purposes.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 5eedf448a4..1ad54e7584 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -193,15 +193,17 @@ module ActiveRecord def log_info(sql, name, ms) if @logger && @logger.debug? - name = '%s (%.1fms)' % [name || 'SQL', ms] + name = '%s (%.1fms)' % [name, ms] @logger.debug(format_log_entry(name, sql.squeeze(' '))) end end protected def log(sql, name) + name ||= "SQL" result = nil - ActiveSupport::Notifications.instrument("active_record.sql", :sql => sql, :name => name) do + ActiveSupport::Notifications.instrument("active_record.sql", + :sql => sql, :name => name, :connection => self) do @runtime += Benchmark.ms { result = yield } end result |