aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-05 17:23:41 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-05 17:23:41 +0000
commit977b4be208c2c54eeaaf7b46953174ef402f49d4 (patch)
tree355b9147b2b687dcf3701a8be3e61aae1d317106 /activerecord
parent4fe0248f57f98d7b3c9095bd5843fb5b10320c06 (diff)
downloadrails-977b4be208c2c54eeaaf7b46953174ef402f49d4.tar.gz
rails-977b4be208c2c54eeaaf7b46953174ef402f49d4.tar.bz2
rails-977b4be208c2c54eeaaf7b46953174ef402f49d4.zip
Changed logging of SQL statements to use the DEBUG level instead of INFO. Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions). Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1714 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 86464919de..cf7d834af4 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Changed logging of SQL statements to use the DEBUG level instead of INFO
+
* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Luetke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
* Added callback hooks to association collections #1549 [Florian Weber]. Example:
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index b440f9b6ba..ea9b6442e7 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -460,7 +460,7 @@ module ActiveRecord
def log_info(sql, name, runtime)
return unless @logger
- @logger.info(
+ @logger.debug(
format_log_entry(
"#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})",
sql.gsub(/ +/, " ")