svn commit: r1206429 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/log/ main/java/org/apache/camel/processor/interceptor/ test/java/org/apache/camel/component/log/ test/java/org/apache/camel/management/

[da...@apache.org]

Author: davsclaus
Date: Sat Nov 26 11:40:14 2011
New Revision: 1206429

URL: http://svn.apache.org/viewvc?rev=1206429&view=rev
Log:
CAMEL-4574: Log and Tracer have maxChars at 10000 by default to avoid logging very big data.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java?rev=1206429&r1=1206428&r2=1206429&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java Sat Nov 26 11:40:14 2011
@@ -48,7 +48,7 @@ public class LogFormatter implements Exc
     private boolean showFuture;
     private boolean showStreams;
     private boolean showFiles;
-    private int maxChars;
+    private int maxChars = 10000;
 
     public String format(Exchange exchange) {
         Message in = exchange.getIn();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java?rev=1206429&r1=1206428&r2=1206429&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java Sat Nov 26 11:40:14 2011
@@ -45,7 +45,7 @@ public class DefaultTraceFormatter imple
     private boolean showOutBodyType;
     private boolean showException = true;
     private boolean showRouteId = true;
-    private int maxChars;
+    private int maxChars = 10000;
 
     public Object format(final TraceInterceptor interceptor, final ProcessorDefinition<?> node, final Exchange exchange) {
         Message in = exchange.getIn();
@@ -249,7 +249,6 @@ public class DefaultTraceFormatter imple
         }
     }
 
-
     protected Object getBreadCrumbID(Exchange exchange) {
         return exchange.getExchangeId();
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java?rev=1206429&r1=1206428&r2=1206429&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java Sat Nov 26 11:40:14 2011
@@ -174,7 +174,7 @@ public class LogFormatterTest extends Co
         assertFalse(formatter.isShowStackTrace());
         assertFalse(formatter.isShowAll());
         assertFalse(formatter.isMultiline());
-        assertEquals(0, formatter.getMaxChars());
+        assertEquals(10000, formatter.getMaxChars());
     }
 
     private static class MyFuture extends FutureTask<String> {

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java?rev=1206429&r1=1206428&r2=1206429&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java Sat Nov 26 11:40:14 2011
@@ -120,7 +120,7 @@ public class ManagedCamelContextTracerTe
         assertEquals(0, formatterNodeLength.intValue());
 
         Integer formatterMaxChars = (Integer) mbeanServer.getAttribute(on, "FormatterMaxChars");
-        assertEquals(0, formatterMaxChars.intValue());
+        assertEquals(10000, formatterMaxChars.intValue());
 
         // now disable tracing
         mbeanServer.setAttribute(camel, new Attribute("Tracing", Boolean.FALSE));