From fd03f1738e089900a4501bdb86fe4aca5354e85e Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Tue, 22 Jun 2010 00:35:38 +0200
Subject: removed default Formatter in logger, not needed with 1.8.7 upwards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../lib/active_support/core_ext/logger.rb          | 38 ----------------------
 1 file changed, 38 deletions(-)

(limited to 'activesupport/lib/active_support/core_ext/logger.rb')

diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
index c4994ca2ee..d023b4bcff 100644
--- a/activesupport/lib/active_support/core_ext/logger.rb
+++ b/activesupport/lib/active_support/core_ext/logger.rb
@@ -72,44 +72,6 @@ class Logger
     @formatter ||= SimpleFormatter.new
   end
 
-  unless const_defined? :Formatter
-    class Formatter
-      Format = "%s, [%s#%d] %5s -- %s: %s\n"
-
-      attr_accessor :datetime_format
-
-      def initialize
-        @datetime_format = nil
-      end
-
-      def call(severity, time, progname, msg)
-        Format % [severity[0..0], format_datetime(time), $$, severity, progname,
-        msg2str(msg)]
-      end
-
-      private
-        def format_datetime(time)
-          if @datetime_format.nil?
-            time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
-          else
-            time.strftime(@datetime_format)
-          end
-        end
-
-        def msg2str(msg)
-          case msg
-          when ::String
-            msg
-          when ::Exception
-            "#{ msg.message } (#{ msg.class })\n" <<
-            (msg.backtrace || []).join("\n")
-          else
-            msg.inspect
-          end
-        end
-    end
-  end
-
   # Simple formatter which only displays the message.
   class SimpleFormatter < Logger::Formatter
     # This method is invoked when a log event occurs
-- 
cgit v1.2.3