Author: indika
Date: Thu Mar 26 08:31:09 2009
New Revision: 758552
URL: http://svn.apache.org/viewvc?rev=758552&view=rev
Log:
minor refactoring in stats code
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsLog.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsLog.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsLog.java?rev=758552&r1=758551&r2=758552&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsLog.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsLog.java
Thu Mar 26 08:31:09 2009
@@ -21,7 +21,7 @@
import org.apache.synapse.aspects.ComponentType;
/**
- *
+ * Statistics at a break point
*/
public class StatisticsLog {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java?rev=758552&r1=758551&r2=758552&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
Thu Mar 26 08:31:09 2009
@@ -49,15 +49,10 @@
if (configurable != null && configurable.isStatisticsEnable()
&& configurable instanceof Identifiable) {
- StatisticsRecord statisticsRecord =
StatisticsReporter.getStatisticsRecord(synCtx);
- statisticsRecord.setOwner(componentType);
- statisticsRecord.collect((Identifiable) configurable,
- componentType, synCtx.isResponse());
-
- StatisticsCollector collector = getStatisticsCollector(synCtx);
- if (!collector.contains(statisticsRecord)) {
- collector.collect(statisticsRecord);
- }
+ StatisticsRecord record =
StatisticsReporter.getStatisticsRecord(synCtx);
+ record.setOwner(componentType);
+ collectStatistics(synCtx, record, configurable, componentType);
+
}
}
@@ -73,12 +68,8 @@
if (configuration != null && configuration.isStatisticsEnable()) {
- StatisticsRecord statisticsRecord =
StatisticsReporter.getStatisticsRecord(synCtx);
- statisticsRecord.collect(configuration, ComponentType.ANY,
synCtx.isResponse());
- StatisticsCollector collector = getStatisticsCollector(synCtx);
- if (!collector.contains(statisticsRecord)) {
- collector.collect(statisticsRecord);
- }
+ StatisticsRecord record =
StatisticsReporter.getStatisticsRecord(synCtx);
+ collectStatistics(synCtx, record, configuration,
ComponentType.ANY);
}
}
@@ -102,6 +93,7 @@
}
private static StatisticsRecord getStatisticsRecord(MessageContext synCtx)
{
+
StatisticsRecord statisticsRecord =
(StatisticsRecord)
synCtx.getProperty(SynapseConstants.STATISTICS_STACK);
if (statisticsRecord == null) {
@@ -115,7 +107,11 @@
return statisticsRecord;
}
- private static StatisticsCollector getStatisticsCollector(MessageContext
synCtx) {
+ private static void collectStatistics(MessageContext synCtx,
+ StatisticsRecord record,
+ StatisticsConfigurable configurable,
+ ComponentType componentType) {
+
StatisticsCollector collector =
synCtx.getEnvironment().getStatisticsCollector();
if (collector == null) {
@@ -125,6 +121,12 @@
collector = new StatisticsCollector();
synCtx.getEnvironment().setStatisticsCollector(collector);
}
- return collector;
+
+ record.collect((Identifiable) configurable,
+ componentType, synCtx.isResponse());
+
+ if (!collector.contains(record)) {
+ collector.collect(record);
+ }
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java?rev=758552&r1=758551&r2=758552&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
Thu Mar 26 08:31:09 2009
@@ -29,8 +29,7 @@
import java.util.Map;
/**
- *
- *
+ * @see org.apache.synapse.aspects.statistics.mbean.StatisticsViewMBean
*/
public class StatisticsView implements StatisticsViewMBean {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java?rev=758552&r1=758551&r2=758552&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
Thu Mar 26 08:31:09 2009
@@ -21,7 +21,7 @@
import java.util.List;
/**
- *
+ * A simple MBean for viewing statistics
*/
public interface StatisticsViewMBean {
