diff --git a/src/wa/server/page/AbstractPage.java b/src/wa/server/page/AbstractPage.java index 655746f..a90cae9 100644 --- a/src/wa/server/page/AbstractPage.java +++ b/src/wa/server/page/AbstractPage.java @@ -61,13 +61,14 @@ public abstract class AbstractPage implements HttpPage{ HttpHeaderParser client_info, Map session, Map cookie, - Map request) { + Map request) throws IOException { WAContext context = (WAContext)session.get("context"); if(context == null){ context = new WAContext(); } - if(("application/json").equals(client_info.getHeader("ContentType"))){ + if(("application/json").equals(client_info.getHeader("ContentType")) || + request.containsKey("json")){ DataNode node = jsonResponse(context, client_info, session, cookie, request); if(node != null) { out.setHeader("Content-Type", "application/json"); diff --git a/src/wa/server/plugin/hwstatus/CpuStatus.java b/src/wa/server/plugin/hwstatus/CpuStatus.java index abebcfd..e07290a 100644 --- a/src/wa/server/plugin/hwstatus/CpuStatus.java +++ b/src/wa/server/plugin/hwstatus/CpuStatus.java @@ -32,6 +32,7 @@ import zutil.io.file.FileUtil; import zutil.parser.DataNode; import java.io.IOException; +import java.text.DecimalFormat; /** * Created by Ziver on 2015-04-07. @@ -57,11 +58,11 @@ public class CpuStatus implements WAStatus { try{ Sigar sigar = new Shell().getSigar(); - for(CpuInfo cpu_info : sigar.getCpuInfoList()){ - for(CpuPerc cpu : sigar.getCpuPercList()){ - cpuNode.add(cpu.getCombined()); - } + CpuInfo cpu_info = sigar.getCpuInfoList()[0]; + for(CpuPerc cpu : sigar.getCpuPercList()){ + cpuNode.add(Math.round(cpu.getCombined() * 100.0) / 100.0 ); } + } catch (SigarException e) { e.printStackTrace(); }