Updated Branches: refs/heads/master c658beb2b -> a851484a4
Add memory consumption function to health checker module Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a851484a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a851484a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a851484a Branch: refs/heads/master Commit: a851484a42a6d704431ec340c10ce53114ceba64 Parents: c658beb Author: Manula Thantriwatte <[email protected]> Authored: Fri Nov 22 16:32:00 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Nov 22 16:32:00 2013 +0530 ---------------------------------------------------------------------- .../agent/health/publisher/HealthPublisherClient.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a851484a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java index 580e499..d452c03 100644 --- a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java +++ b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisherClient.java @@ -38,13 +38,12 @@ public class HealthPublisherClient { Map<String, Double> statsMap = new HashMap<String, Double>(); - //statsMap.put("Available Processors", (int)runtime.availableProcessors()); - statsMap.put("total_memory", (double)(runtime.totalMemory() / MB)); - //statsMap.put("max_memory", (int)(runtime.maxMemory() / MB)); - statsMap.put("used_memory", (double)((runtime.totalMemory() - runtime.freeMemory()) / MB)); - //statsMap.put("free_memory", (int)(runtime.freeMemory() / MB)); + double totalMemory = (double)(runtime.totalMemory() / MB); + double usedMemory = (double)((totalMemory - (runtime.freeMemory() / MB) )); + double memoryConsumption = (usedMemory / totalMemory) * 100; + + statsMap.put("memory_consumption", memoryConsumption); statsMap.put("load_average", (double)ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage()); - //statsMap.put("member_id", Integer.parseInt(memberID)); Object statObj = (Object)statsMap;
