Author: davsclaus
Date: Mon Sep 29 05:16:07 2008
New Revision: 700085
URL: http://svn.apache.org/viewvc?rev=700085&view=rev
Log:
CAMEL-945: Added logName option for Tracer
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
(contents, props changed)
- copied, changed from r699876,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=700085&r1=700084&r2=700085&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
Mon Sep 29 05:16:07 2008
@@ -31,7 +31,7 @@
* @version $Revision$
*/
public class TraceInterceptor extends DelegateProcessor implements
ExchangeFormatter {
- private final Logger logger = new
Logger(LogFactory.getLog(TraceInterceptor.class), this);
+ private Logger logger;
private final ProcessorType node;
private final Tracer tracer;
private TraceFormatter formatter;
@@ -42,10 +42,19 @@
this.node = node;
this.formatter = formatter;
- // set logging level
+ // set logger to use
+ if (tracer.getLogName() != null) {
+ logger = new Logger(LogFactory.getLog(tracer.getLogName()), this);
+ } else {
+ // use default logger
+ logger = new Logger(LogFactory.getLog(TraceInterceptor.class),
this);
+ }
+
+ // set logging level if provided
if (tracer.getLevel() != null) {
logger.setLevel(tracer.getLevel());
}
+
if (tracer.getFormatter() != null) {
this.formatter = tracer.getFormatter();
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=700085&r1=700084&r2=700085&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
Mon Sep 29 05:16:07 2008
@@ -40,6 +40,7 @@
private Predicate<Exchange> traceFilter;
private boolean traceInterceptors;
private boolean traceExceptions = true;
+ private String logName;
/**
* A helper method to return the Tracer instance for a given [EMAIL
PROTECTED] CamelContext} if one is enabled
@@ -126,4 +127,16 @@
public void setTraceExceptions(boolean traceExceptions) {
this.traceExceptions = traceExceptions;
}
+
+ public String getLogName() {
+ return logName;
+ }
+
+ /**
+ * Sets the logging name to use.
+ * Will default use
<tt>org.apache.camel.processor.interceptor.TraceInterceptor<tt>.
+ */
+ public void setLogName(String logName) {
+ this.logName = logName;
+ }
}
\ No newline at end of file
Copied:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
(from r699876,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java?p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java&r1=699876&r2=700085&rev=700085&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceInterceptorTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
Mon Sep 29 05:16:07 2008
@@ -17,45 +17,36 @@
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.interceptor.Tracer;
/**
* @version $Revision$
*/
-public class TraceInterceptorTest extends ContextTestSupport {
+public class TracerConfigurationTest extends ContextTestSupport {
- // START SNIPPET: e1
- public void testSendingSomeMessages() throws Exception {
- template.sendBodyAndHeader("direct:start", "Hello London", "to",
"James");
- template.sendBodyAndHeader("direct:start", "This is Copenhagen
calling", "from", "Claus");
+ public void testTracerConfiguration() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- // add tracer as an interceptor so it will log the exchange
executions at runtime
- // this can aid us to understand/see how the exchanges is
routed etc.
- getContext().addInterceptStrategy(new Tracer());
-
- from("direct:start").
- process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- // do nothing
- }
-
- @Override
- public String toString() {
- return "MyProcessor";
- }
- }).
- to("mock:a").
- to("mock:b");
+ Tracer tracer = new Tracer();
+ tracer.setLevel(LoggingLevel.FATAL);
+ tracer.setLogName("com.mycompany");
+
+ getContext().addInterceptStrategy(tracer);
+
+ from("direct:start").to("mock:result");
}
};
}
- // END SNIPPET: e1
-}
+}
\ No newline at end of file
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
