aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-19 14:24:16 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-19 14:24:16 +0000
commit88192b9b1be2bd0729073c899df42a789f264993 (patch)
tree4e5642e90a327e9d1eb2f95abb20b552212492a4 /activerecord/lib
parent830c561e7105f89020f2c3ccb465aa0864e92b87 (diff)
downloadrails-88192b9b1be2bd0729073c899df42a789f264993.tar.gz
rails-88192b9b1be2bd0729073c899df42a789f264993.tar.bz2
rails-88192b9b1be2bd0729073c899df42a789f264993.zip
Added that query benchmarking will only happen if its going to be logged anyway #344
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@227 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 1a26057528..66b5962b18 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -349,7 +349,7 @@ module ActiveRecord
protected
def log(sql, name, connection, &action)
begin
- if @logger.nil?
+ if @logger.nil? || @logger.level > Logger::INFO
action.call(connection)
else
result = nil