From 2cdd61458f2df3d049ab1f256160b173fc52dd5c Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Tue, 28 Apr 2015 20:55:00 +0000 Subject: [PATCH] Implementation of Network status page --- src/wa/server/page/StatusPage.java | 5 +- src/wa/server/plugin/hwstatus/HDDStatus.java | 5 +- src/wa/server/plugin/hwstatus/HDDStatus.tmpl | 37 +++-- src/wa/server/plugin/hwstatus/HwStatus.java | 8 +- src/wa/server/plugin/hwstatus/NetStatus.java | 135 ++++++++++++++++++ src/wa/server/plugin/hwstatus/NetStatus.tmpl | 141 +++++++++++++++++++ src/wa/server/util/ThroughputCalculator.java | 51 +++++++ 7 files changed, 355 insertions(+), 27 deletions(-) create mode 100644 src/wa/server/plugin/hwstatus/NetStatus.java create mode 100644 src/wa/server/plugin/hwstatus/NetStatus.tmpl create mode 100644 src/wa/server/util/ThroughputCalculator.java diff --git a/src/wa/server/page/StatusPage.java b/src/wa/server/page/StatusPage.java index 638745d..89e3ceb 100644 --- a/src/wa/server/page/StatusPage.java +++ b/src/wa/server/page/StatusPage.java @@ -74,9 +74,10 @@ public class StatusPage implements WAPage { Map request){ if(request.containsKey("i")) { - WAStatus obj = getPlugin(context); DataNode root = new DataNode(DataNode.DataType.Map); - obj.jsonUpdate(request, root); + WAStatus obj = getPlugin(context); + if(obj != null) + obj.jsonUpdate(request, root); return root; } return null; diff --git a/src/wa/server/plugin/hwstatus/HDDStatus.java b/src/wa/server/plugin/hwstatus/HDDStatus.java index 2ce32f4..93fad58 100644 --- a/src/wa/server/plugin/hwstatus/HDDStatus.java +++ b/src/wa/server/plugin/hwstatus/HDDStatus.java @@ -46,7 +46,7 @@ public class HDDStatus implements WAStatus { @Override public String getName() { - return "HDD Status"; + return "Harddrives"; } @Override @@ -79,8 +79,7 @@ public class HDDStatus implements WAStatus { node.set("id", idMap.get(device)); else{ idMap.put(device, nextId); - node.set("id", nextId); - ++nextId; + node.set("id", nextId++); } FileSystemUsage hdd_use = sigar.getFileSystemUsage(hdd.getDirName()); diff --git a/src/wa/server/plugin/hwstatus/HDDStatus.tmpl b/src/wa/server/plugin/hwstatus/HDDStatus.tmpl index e68b0b4..7457803 100644 --- a/src/wa/server/plugin/hwstatus/HDDStatus.tmpl +++ b/src/wa/server/plugin/hwstatus/HDDStatus.tmpl @@ -9,15 +9,24 @@