You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/20 10:16:24 UTC
git commit: Changed member health stat value type to double in
cartridge agent
Updated Branches:
refs/heads/master d6e688bcd -> 6ac8339fa
Changed member health stat value type to double in cartridge agent
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6ac8339f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6ac8339f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6ac8339f
Branch: refs/heads/master
Commit: 6ac8339fa8d866582ef154476928582531210851
Parents: d6e688b
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 20 14:46:13 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 20 14:46:13 2013 +0530
----------------------------------------------------------------------
.../statistics/publisher/HealthStatisticsNotifier.java | 10 +++++-----
.../statistics/publisher/HealthStatisticsPublisher.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6ac8339f/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index 9412e28..4beeee9 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@ -64,13 +64,13 @@ public class HealthStatisticsNotifier implements Runnable {
CartridgeAgentConfiguration.getInstance().getMemberId(),
CartridgeAgentConfiguration.getInstance().getPartitionId(),
CartridgeAgentConstants.PORTS_NOT_OPEN,
- "1"
+ 1
);
}
- String memoryConsumption = String.valueOf(HealthStatisticsReader.getMemoryConsumption());
+ double memoryConsumption = HealthStatisticsReader.getMemoryConsumption();
if(log.isInfoEnabled()) {
- log.info(String.format("Publishing memory consumption: %s", memoryConsumption));
+ log.info(String.format("Publishing memory consumption: %d", memoryConsumption));
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),
@@ -81,9 +81,9 @@ public class HealthStatisticsNotifier implements Runnable {
memoryConsumption
);
- String loadAverage = String.valueOf(HealthStatisticsReader.getLoadAverage());
+ double loadAverage = HealthStatisticsReader.getLoadAverage();
if(log.isInfoEnabled()) {
- log.info(String.format("Publishing load average: %s", loadAverage));
+ log.info(String.format("Publishing load average: %d", loadAverage));
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6ac8339f/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
index 1c23cb9..094e6fc 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
@@ -50,7 +50,7 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
payloadData.add(new Attribute("member_id", AttributeType.STRING));
payloadData.add(new Attribute("partition_id", AttributeType.STRING));
payloadData.add(new Attribute("health_description", AttributeType.STRING));
- payloadData.add(new Attribute("value", AttributeType.STRING));
+ payloadData.add(new Attribute("value", AttributeType.DOUBLE));
streamDefinition.setPayloadData(payloadData);
return streamDefinition;
@@ -72,7 +72,7 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
* @param health
* @param value
*/
- public void publish(String clusterId, String networkPartitionId, String memberId, String partitionId, String health, String value) {
+ public void publish(String clusterId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
if(log.isInfoEnabled()) {
log.info(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [health] %s [value] %s",
clusterId, networkPartitionId, partitionId, memberId, health, value));