You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/09/29 19:49:54 UTC
svn commit: r700185 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/processor/interceptor/
camel-core/src/test/java/org/apache/camel/processor/
components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/
Author: davsclaus
Date: Mon Sep 29 10:49:53 2008
New Revision: 700185
URL: http://svn.apache.org/viewvc?rev=700185&view=rev
Log:
CAMEL-945: tracer option level renamed to logLevel to be alligned with logName.
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
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
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=700185&r1=700184&r2=700185&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 10:49:53 2008
@@ -51,8 +51,8 @@
}
// set logging level if provided
- if (tracer.getLevel() != null) {
- logger.setLevel(tracer.getLevel());
+ if (tracer.getLogLevel() != null) {
+ logger.setLevel(tracer.getLogLevel());
}
if (tracer.getFormatter() != null) {
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=700185&r1=700184&r2=700185&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 10:49:53 2008
@@ -36,11 +36,11 @@
private TraceFormatter formatter = new TraceFormatter();
private boolean enabled = true;
- private LoggingLevel level;
+ private String logName;
+ private LoggingLevel logLevel;
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 {@link CamelContext} if one is enabled
@@ -106,15 +106,15 @@
this.traceFilter = traceFilter;
}
- public LoggingLevel getLevel() {
- return level;
+ public LoggingLevel getLogLevel() {
+ return logLevel;
}
/**
* Sets the logging level to ouput tracing. Will default use <tt>INFO</tt> level.
*/
- public void setLevel(LoggingLevel level) {
- this.level = level;
+ public void setLogLevel(LoggingLevel logLevel) {
+ this.logLevel = logLevel;
}
public boolean isTraceExceptions() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java?rev=700185&r1=700184&r2=700185&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TracerConfigurationTest.java Mon Sep 29 10:49:53 2008
@@ -39,7 +39,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
Tracer tracer = new Tracer();
- tracer.setLevel(LoggingLevel.FATAL);
+ tracer.setLogLevel(LoggingLevel.FATAL);
tracer.setLogName("com.mycompany");
getContext().addInterceptStrategy(tracer);
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml?rev=700185&r1=700184&r2=700185&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/tracerConfigurationTest.xml Mon Sep 29 10:49:53 2008
@@ -28,7 +28,8 @@
<bean id="camelTracer" class="org.apache.camel.processor.interceptor.Tracer">
<property name="traceExceptions" value="false"/>
<property name="traceInterceptors" value="true"/>
- <property name="level" value="FATAL"/>
+ <property name="logLevel" value="FATAL"/>
+ <property name="logName" value="com.mycompany.messages"/>
</bean>
<camelContext id="camel" trace="true" xmlns="http://activemq.apache.org/camel/schema/spring">