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/11/08 23:12:45 UTC
svn commit: r712440 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/component/log/LogComponent.java
main/java/org/apache/camel/processor/Logger.java
test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
Author: davsclaus
Date: Sat Nov 8 14:12:44 2008
New Revision: 712440
URL: http://svn.apache.org/viewvc?rev=712440&view=rev
Log:
CAMEL-656: Polished log component.
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java (contents, props changed)
- copied, changed from r712398, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java?rev=712440&r1=712439&r2=712440&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java Sat Nov 8 14:12:44 2008
@@ -42,7 +42,7 @@
Logger logger;
if (groupSize != null) {
- logger = new ThroughputLogger(remaining, level, ObjectConverter.toInteger(groupSize));
+ logger = new ThroughputLogger(remaining, level, groupSize);
} else {
LogFormatter formatter = new LogFormatter();
IntrospectionSupport.setProperties(formatter, parameters);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java?rev=712440&r1=712439&r2=712440&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java Sat Nov 8 14:12:44 2008
@@ -98,6 +98,8 @@
log.warn(logMessage(exchange));
}
break;
+ case OFF:
+ break;
default:
log.error("Unknown level: " + level + " when trying to log exchange: " + logMessage(exchange));
}
@@ -179,6 +181,8 @@
log.warn(message);
}
break;
+ case OFF:
+ break;
default:
log.error("Unknown level: " + level + " when trying to log exchange: " + message);
}
Copied: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java (from r712398, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java?p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java&r1=712398&r2=712440&rev=712440&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java Sat Nov 8 14:12:44 2008
@@ -17,34 +17,33 @@
package org.apache.camel.component.log;
import org.apache.camel.ContextTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* @version $Revision$
*/
-public class LogRouteTest extends ContextTestSupport {
- private static final Log LOG = LogFactory.getLog(LogRouteTest.class);
+public class ThroughputLoggerTest extends ContextTestSupport {
public void testSendMessageToLog() throws Exception {
- template.sendBody("log:org.apache.camel.TEST", "<level>default</level>");
- }
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(4);
- public void testSendMessageToInfoLog() throws Exception {
- template.sendBody("log:org.apache.camel.TEST?level=INFO", "<level>INFO</level>");
- }
+ template.sendBody("seda:in", "Hello World");
+ template.sendBody("seda:in", "Hello World");
+ template.sendBody("seda:in", "Bye World");
+ template.sendBody("seda:in", "Bye World");
- public void testSendMessageToWarnLog() throws Exception {
- template.sendBody("log:org.apache.camel.TEST?level=warn", "<level>WARN</level>");
+ assertMockEndpointsSatisfied();
}
- public void testSendMessageToBadLevel() throws Exception {
- try {
- template.sendBody("log:org.apache.camel.TEST?level=noSuchLevel", "<level>noSuchLevel</level>");
- fail("Shoudl have failed!");
- } catch (Exception e) {
- LOG.debug("Caught expected exception: " + e, e);
- }
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("seda:in").to("log:hello?groupSize=2").delayer(100).to("mock:result");
+ }
+ };
}
-
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/ThroughputLoggerTest.java
------------------------------------------------------------------------------
svn:mergeinfo =