@@ -26,6 +26,7 @@ * [#34] Mack::l10n now raises exception with a fully qualified name. * [#33] mack-active_record now requires ActiveRecord 2.0.2 explicitly, not >=2.0.2 * [#31] Added support for ruby-debug. +* [#26] Log Coloring for console output. * [#24] Added mack-notifier support. * [#18] Added Page caching. All that's needed for using page caching is to require the mack-caching gem, turn on page caching in your config files with: CHANGELOG @@ -15,6 +15,31 @@ module Mack end unless Mack.logger + + module Log4r # :nodoc: + class IOOutputter # :nodoc: + + # let's not do this more than once. :) + unless Log4r::IOOutputter.private_instance_methods.include?("old_write") + + alias_method :old_write, :write + + def write(data) + case data + when /^(DEBUG:|INFO:|WARN:|ERROR:|FATAL:)\s\[.*\]\s(SELECT|INSERT|UPDATE|DELETE|CREATE|DROP)/ + old_write(Color.yellow(data)) + when /^(ERROR:|FATAL:)/ + old_write(Color.red(data)) + else + old_write(data) + end + end + + end + + end # IOOutputter + end # Log4r + log_directory = app_config.log_root || File.join(Mack.root, "log") FileUtils.mkdir_p(log_directory) lib/mack/initialization/logging.rb @@ -20,7 +20,7 @@ module Mack msg = "\n\t[#{request.request_method.upcase}] '#{request.path_info}'\n" msg << "\tSession ID: #{request.session.id}\n" if app_config.mack.use_sessions msg << "\tParameters: #{request.all_params}\n" - msg << "\tCompleted in #{@total_time} (#{@requests_per_second} reqs/sec) | #{response.status} [#{request.full_host}]" + msg << Color.green("\tCompleted in #{@total_time} (#{@requests_per_second} reqs/sec) | #{response.status} [#{request.full_host}]") else msg = "[#{request.request_method.upcase}] '#{request.path_info}' (#{total_time})" end lib/mack/runner_helpers/request_logger.rb @@ -19,6 +19,7 @@ require 'genosaurus' require 'net/http' require 'pp' require 'test/unit' +require 'redgreen' fl = File.join(File.dirname(__FILE__), "mack") lib/mack_core.rb @@ -61,6 +61,7 @@ namespace :gem do s.add_dependency("rcov", "0.8.1.2.0") s.add_dependency("rspec", "1.1.4") s.add_dependency("ruby-debug", "0.10.0") + s.add_dependency("redgreen", "1.2.2") s.rubyforge_project = gh.project tasks/mack_gem_tasks.rake e815e3f8762974691c8c27dd4265fec3d4c9999c Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/006aadb593b186cb01890d240cb7136e8e43c2f5 006aadb593b186cb01890d240cb7136e8e43c2f5 2008-07-31T11:10:25-07:00 2008-07-31T11:10:25-07:00 Feature: Log Coloring for console output [#26 state:resolved] 5df436e9d322ed95430d50a5216e2194b5e77908 Mark Bates mark@markbates.com