aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-12 18:29:48 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-13 01:19:23 +0100
commitdc2e291a939e1089300bdac972cb7b63548d9ec1 (patch)
treee3872cabb5d8c87abb0a2f381ac2d326d34e0031 /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
parentfe3ceabeed6bde67eb9c0e64b27e133a66e13d83 (diff)
downloadrails-dc2e291a939e1089300bdac972cb7b63548d9ec1.tar.gz
rails-dc2e291a939e1089300bdac972cb7b63548d9ec1.tar.bz2
rails-dc2e291a939e1089300bdac972cb7b63548d9ec1.zip
Move AR logging responsibilities to ActiveRecord::Railties::Subscriber.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb26
1 files changed, 1 insertions, 25 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 1b8d3f7a05..4a9cc09032 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -190,13 +190,6 @@ module ActiveRecord
"active_record_#{open_transactions}"
end
- def log_info(sql, name, ms)
- if @logger && @logger.debug?
- name = '%s (%.1fms)' % [name, ms]
- @logger.debug(format_log_entry(name, sql.squeeze(' ')))
- end
- end
-
protected
def log(sql, name)
name ||= "SQL"
@@ -208,7 +201,7 @@ module ActiveRecord
result
rescue Exception => e
message = "#{e.class.name}: #{e.message}: #{sql}"
- log_info(message, name, 0)
+ @logger.debug message if @logger
raise translate_exception(e, message)
end
@@ -217,23 +210,6 @@ module ActiveRecord
ActiveRecord::StatementInvalid.new(message)
end
- def format_log_entry(message, dump = nil)
- if ActiveRecord::Base.colorize_logging
- if @@row_even
- @@row_even = false
- message_color, dump_color = "4;36;1", "0;1"
- else
- @@row_even = true
- message_color, dump_color = "4;35;1", "0"
- end
-
- log_entry = " \e[#{message_color}m#{message}\e[0m "
- log_entry << "\e[#{dump_color}m%#{String === dump ? 's' : 'p'}\e[0m" % dump if dump
- log_entry
- else
- "%s %s" % [message, dump]
- end
- end
end
end
end