Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added ActiveRecord::Base.colorize_logging to control whether to use c…

…olors in logs or not (on by default)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@860 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 911614df6eb4ea1f19c71aea57b1aea0b243c73a 1 parent 7ba3903
David Heinemeier Hansson dhh authored
2  activerecord/CHANGELOG
View
@@ -1,5 +1,7 @@
*SVN*
+* Added ActiveRecord::Base.colorize_logging to control whether to use colors in logs or not (on by default)
+
* Added support for timestamp with time zone in PostgreSQL #560 [Scott Barron]
* Added MultiparameterAssignmentErrors and AttributeAssignmentError exceptions #777 [demetrius]. Documentation:
6 activerecord/lib/active_record/base.rb
View
@@ -264,6 +264,12 @@ def self.inherited(child) #:nodoc:
cattr_accessor :pluralize_table_names
@@pluralize_table_names = true
+ # Determines whether or not to use ANSI codes to colorize the logging statements committed by the connection adapter. These colors
+ # makes it much easier to overview things during debugging (when used through a reader like +tail+ and on a black background), but
+ # may complicate matters if you use software like syslog. This is true, by default.
+ cattr_accessor :colorize_logging
+ @@colorize_logging = true
+
# Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates and times from the database.
# This is set to :local by default.
cattr_accessor :default_timezone
20 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View
@@ -422,16 +422,20 @@ def log_info(sql, name, runtime)
end
def format_log_entry(message, dump = nil)
- if @@row_even then
- @@row_even = false; caller_color = "1;32"; message_color = "4;33"; dump_color = "1;37"
+ if ActiveRecord::Base.colorize_logging
+ if @@row_even then
+ @@row_even = false; caller_color = "1;32"; message_color = "4;33"; dump_color = "1;37"
+ else
+ @@row_even = true; caller_color = "1;36"; message_color = "4;35"; dump_color = "0;37"
+ end
+
+ log_entry = " \e[#{message_color}m#{message}\e[m"
+ log_entry << " \e[#{dump_color}m%s\e[m" % dump if dump.kind_of?(String) && !dump.nil?
+ log_entry << " \e[#{dump_color}m%p\e[m" % dump if !dump.kind_of?(String) && !dump.nil?
+ log_entry
else
- @@row_even = true; caller_color = "1;36"; message_color = "4;35"; dump_color = "0;37"
+ "%s %s" % [message, dump]
end
-
- log_entry = " \e[#{message_color}m#{message}\e[m"
- log_entry << " \e[#{dump_color}m%s\e[m" % dump if dump.kind_of?(String) && !dump.nil?
- log_entry << " \e[#{dump_color}m%p\e[m" % dump if !dump.kind_of?(String) && !dump.nil?
- log_entry
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.