Author: lhein
Date: Fri Jan 14 14:41:35 2011
New Revision: 1059022
URL: http://svn.apache.org/viewvc?rev=1059022&view=rev
Log:
added flag to suppress content logging of messages (see SMX4NMR-243)
Modified:
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/ExchangeUtils.java
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/util/ExchangeUtilsTest.java
Modified:
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/ExchangeUtils.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/ExchangeUtils.java?rev=1059022&r1=1059021&r2=1059022&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/ExchangeUtils.java
(original)
+++
servicemix/smx4/nmr/trunk/nmr/core/src/main/java/org/apache/servicemix/nmr/core/util/ExchangeUtils.java
Fri Jan 14 14:41:35 2011
@@ -16,37 +16,37 @@
*/
package org.apache.servicemix.nmr.core.util;
-import java.util.Arrays;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.stream.StreamResult;
-
import org.apache.servicemix.nmr.api.Exchange;
import org.apache.servicemix.nmr.api.Message;
import org.apache.servicemix.nmr.api.Type;
import org.apache.servicemix.nmr.api.internal.InternalExchange;
import org.apache.servicemix.nmr.core.NmrRuntimeException;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.*;
+import java.util.Arrays;
+
public class ExchangeUtils {
public static final int MAX_MSG_DISPLAY_SIZE = 1500;
+ protected static final String SYSTEM_PROPERTY_SUPPRESS_CONTENT =
"servicemix.nmr.suppressContentLogging";
+
+ private static boolean suppressContent =
Boolean.parseBoolean(System.getProperty(SYSTEM_PROPERTY_SUPPRESS_CONTENT,
"false"));
+
public static String display(Exchange exchange, boolean displayContent) {
- if (displayContent) {
+
+ suppressContent =
Boolean.parseBoolean(System.getProperty(SYSTEM_PROPERTY_SUPPRESS_CONTENT,
"false"));
+
+ if (displayContent && !suppressContent) {
ensureReReadable(exchange);
}
+
StringBuffer sb = new StringBuffer();
sb.append("[\n");
sb.append(" id: ").append(exchange.getId()).append('\n');
@@ -69,7 +69,7 @@ public class ExchangeUtils {
}
sb.append(" ]").append('\n');
}
- if (displayContent) {
+ if (displayContent && !suppressContent) {
display(exchange, Type.In, sb);
display(exchange, Type.Out, sb);
display(exchange, Type.Fault, sb);
Modified:
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/util/ExchangeUtilsTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/util/ExchangeUtilsTest.java?rev=1059022&r1=1059021&r2=1059022&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/util/ExchangeUtilsTest.java
(original)
+++
servicemix/smx4/nmr/trunk/nmr/core/src/test/java/org/apache/servicemix/nmr/core/util/ExchangeUtilsTest.java
Fri Jan 14 14:41:35 2011
@@ -16,23 +16,21 @@
*/
package org.apache.servicemix.nmr.core.util;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.nmr.api.Exchange;
+import org.apache.servicemix.nmr.api.Message;
import org.apache.servicemix.nmr.api.Pattern;
import org.apache.servicemix.nmr.api.Status;
-import org.apache.servicemix.nmr.api.Message;
import org.apache.servicemix.nmr.core.ExchangeImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.dom.DOMSource;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
public class ExchangeUtilsTest extends TestCase {
@@ -77,6 +75,17 @@ public class ExchangeUtilsTest extends T
assertNotNull(msg.getAttachment("id"));
assertTrue(msg.getAttachment("id") instanceof ByteArrayInputStream);
assertTrue(str.indexOf("<hello/>") != -1);
+
+ // now switch to suppression mode
+ System.setProperty(ExchangeUtils.SYSTEM_PROPERTY_SUPPRESS_CONTENT,
"true");
+
+ str = e.display(true);
+ LOG.info(str);
+ assertNotNull(msg.getBody());
+ assertTrue(msg.getBody() instanceof StringSource);
+ assertNotNull(msg.getAttachment("id"));
+ assertTrue(msg.getAttachment("id") instanceof ByteArrayInputStream);
+ assertTrue(str.indexOf("<hello/>") == -1);
}
private Document parse(String str) throws Exception {
