Author: ningjiang
Date: Fri Nov 14 07:48:30 2008
New Revision: 714045
URL: http://svn.apache.org/viewvc?rev=714045&view=rev
Log:
Merged revisions 714032 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r714032 | gtully | 2008-11-14 23:29:44 +0800 (Fri, 14 Nov 2008) | 1 line
CAMEL-1090 fix reporting of duration in log message, used for DataSet
........
Added:
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
- copied unchanged from r714032,
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 07:48:30 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java?rev=714045&r1=714044&r2=714045&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
Fri Nov 14 07:48:30 2008
@@ -123,9 +123,10 @@
double rate = messagesPerSecond(groupSize, groupStartTime, time);
double average = messagesPerSecond(receivedCount, startTime, time);
+ long duration = time - groupStartTime;
groupStartTime = time;
- return getAction() + ": " + receivedCount + " messages so far. Last
group took: " + (time - groupStartTime)
+ return getAction() + ": " + receivedCount + " messages so far. Last
group took: " + (duration)
+ " millis which is: " + numberFormat.format(rate)
+ " messages per second. average: " +
numberFormat.format(average);
}
