svn commit: r1438577 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log: ColorFormatter.java SingleLineFormatter.java

[rm...@apache.org]

Author: rmannibucau
Date: Fri Jan 25 16:24:29 2013
New Revision: 1438577

URL: http://svn.apache.org/viewvc?rev=1438577&view=rev
Log:
better impl of SingleLineFormatter

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java?rev=1438577&r1=1438576&r2=1438577&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java Fri Jan 25 16:24:29 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.openejb.log;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -42,6 +44,33 @@ public class ColorFormatter extends Sing
         colors.put(Level.SEVERE, color("severe", Ansi.Color.RED.name()));
     }
 
+    @Override
+    public synchronized String format(LogRecord record) {
+        final boolean exception = record.getThrown() != null;
+        final Ansi sbuf = prefix(record);
+        sbuf.a(record.getLevel().getLocalizedName());
+        sbuf.a(" - ");
+        sbuf.a(formatMessage(record));
+        if (!exception) {
+            suffix(sbuf, record);
+        }
+        sbuf.newline();
+        if (exception) {
+            try {
+                final StringWriter sw = new StringWriter();
+                final PrintWriter pw = new PrintWriter(sw);
+                record.getThrown().printStackTrace(pw);
+                pw.close();
+                sbuf.a(sw.toString());
+            } catch (Exception ex) {
+                // no-op
+            } finally {
+                suffix(sbuf, record);
+            }
+        }
+        return sbuf.toString();
+    }
+
     private Ansi.Color color(final String lvl, final String aDefault) {
         try {
             return Ansi.Color.valueOf(SystemInstance.get().getProperty(OPENEJB_LOG_COLOR_PREFIX + lvl, aDefault));

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java?rev=1438577&r1=1438576&r2=1438577&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java Fri Jan 25 16:24:29 2013
@@ -16,46 +16,33 @@
  */
 package org.apache.openejb.log;
 
-import org.fusesource.jansi.Ansi;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
 public class SingleLineFormatter extends Formatter {
+    private static final String SEP = System.getProperty("line.separator", "\n");
+
     @Override
     public synchronized String format(LogRecord record) {
         final boolean exception = record.getThrown() != null;
-        final Ansi sbuf = prefix(record);
-        sbuf.a(record.getLevel().getLocalizedName());
-        sbuf.a(" - ");
-        sbuf.a(formatMessage(record));
-        if (!exception) {
-            suffix(sbuf, record);
-        }
-        sbuf.newline();
+        final StringBuilder sbuf = new StringBuilder();
+        sbuf.append(record.getLevel().getLocalizedName());
+        sbuf.append(" - ");
+        sbuf.append(formatMessage(record));
+        sbuf.append(SEP);
         if (exception) {
             try {
                 final StringWriter sw = new StringWriter();
                 final PrintWriter pw = new PrintWriter(sw);
                 record.getThrown().printStackTrace(pw);
                 pw.close();
-                sbuf.a(sw.toString());
+                sbuf.append(sw.toString());
             } catch (Exception ex) {
                 // no-op
-            } finally {
-                suffix(sbuf, record);
             }
         }
         return sbuf.toString();
     }
-
-    protected Ansi prefix(final LogRecord record) {
-        return Ansi.ansi();
-    }
-
-    protected Ansi suffix(final Ansi ansi, final LogRecord record) {
-        return ansi;
-    }
 }