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/05/31 18:54:55 UTC
svn commit: r1746320 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src:
main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
Author: degenaro
Date: Tue May 31 18:54:54 2016
New Revision: 1746320
URL: http://svn.apache.org/viewvc?rev=1746320&view=rev
Log:
UIMA-4923 DUCC Web Server (WS) should not display nodes that have been removed from service on Machines page
- Code simplifications
- Use sort name to insure uniqueness between defined and agent reported nodes
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java?rev=1746320&r1=1746319&r2=1746320&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java Tue May 31 18:54:54 2016
@@ -41,7 +41,8 @@ public class MachineFacts implements Ser
public List<String> aliens;
public String heartbeat;
- public MachineFacts(String status,
+ public MachineFacts(String status,
+ String statusReason,
String ip,
String name,
String memTotal,
@@ -56,7 +57,7 @@ public class MachineFacts implements Ser
)
{
this.status = status;
- this.statusReason = "";
+ this.statusReason = statusReason;
this.ip = ip;
this.name = name;
this.memTotal = memTotal;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java?rev=1746320&r1=1746319&r2=1746320&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java Tue May 31 18:54:54 2016
@@ -133,7 +133,7 @@ public class MachineFactsTest {
boolean cgroups = createCgroups();
List<String> aliens = createAliens();
String heartbeat = createHeartbeat();
- MachineFacts machineFacts = new MachineFacts(status,ip,name, memTotal, memFree, swap, delta, free, cpu, cgroups, aliens, heartbeat);
+ MachineFacts machineFacts = new MachineFacts(status,"",ip,name, memTotal, memFree, swap, delta, free, cpu, cgroups, aliens, heartbeat);
return machineFacts;
}