You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/03/04 22:44:53 UTC
svn commit: r1733658 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerClassic.java DuccHandlerJsonFormat.java
Author: degenaro
Date: Fri Mar 4 21:44:53 2016
New Revision: 1733658
URL: http://svn.apache.org/viewvc?rev=1733658&view=rev
Log:
UIMA-4815 DUCC Web Server (WS) System Machines page re-imagined
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1733658&r1=1733657&r2=1733658&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Fri Mar 4 21:44:53 2016
@@ -1667,8 +1667,8 @@ public class DuccHandlerClassic extends
row.append("</td>");
// CPU: load average
row.append("<td align=\"right\">");
- String cpuTotal = formatter3.format(sumCPU/sumMachines);
- row.append(cpuTotal);
+ String cpuTotal = formatter1.format(sumCPU/sumMachines);
+ row.append(""+cpuTotal);
row.append("</td>");
// Swap: inuse
row.append("<td align=\"right\">");
@@ -1767,10 +1767,10 @@ public class DuccHandlerClassic extends
row.append("</td>");
}
// CPU: load average
- row.append("<td>");
+ row.append("<td align=\"right\">");
if(facts.status != null) {
if(facts.status.equals("up")) {
- String cpu = formatter3.format(facts.cpu);
+ String cpu = formatter1.format(facts.cpu);
row.append(cpu);
}
}
@@ -1906,6 +1906,7 @@ public class DuccHandlerClassic extends
duccLogger.trace(methodName, jobid, messages.fetch("exit"));
}
+ private static DecimalFormat formatter1 = new DecimalFormat("##0.0");
private static DecimalFormat formatter3 = new DecimalFormat("##0.000");
private void handleServletClassicSystemBroker(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1733658&r1=1733657&r2=1733658&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Fri Mar 4 21:44:53 2016
@@ -1465,7 +1465,7 @@ public class DuccHandlerJsonFormat exten
// Memory: free
row.add(new JsonPrimitive(sumMemFree));
// CPU: load average
- String cpuTotal = formatter3.format(sumCPU/sumMachines);
+ String cpuTotal = formatter1.format(sumCPU/sumMachines);
row.add(new JsonPrimitive(cpuTotal));
// Swap: inuse
row.add(new JsonPrimitive(sumSwapInuse));
@@ -1540,7 +1540,7 @@ public class DuccHandlerJsonFormat exten
}
// CPU: load average
if(!status.equals("defined")) {
- String cpu = formatter3.format(facts.cpu);
+ String cpu = formatter1.format(facts.cpu);
row.add(new JsonPrimitive(cpu));
}
else {
@@ -1657,6 +1657,7 @@ public class DuccHandlerJsonFormat exten
duccLogger.trace(methodName, jobid, messages.fetch("exit"));
}
+ private static DecimalFormat formatter1 = new DecimalFormat("##0.0");
private static DecimalFormat formatter3 = new DecimalFormat("##0.000");
private void handleServletJsonFormatBrokerAaData(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)