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 2014/04/04 01:12:24 UTC
svn commit: r1584458 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/registry/ java/org/apache/uima/ducc/ws/server/
webapp/root/
Author: degenaro
Date: Thu Apr 3 23:12:24 2014
New Revision: 1584458
URL: http://svn.apache.org/r1584458
Log:
UIMA-3682 DUCC WebServer (WS) display of Service Last Use time
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/IServicesRegistry.java
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
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/IServicesRegistry.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/IServicesRegistry.java?rev=1584458&r1=1584457&r2=1584458&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/IServicesRegistry.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/IServicesRegistry.java Thu Apr 3 23:12:24 2014
@@ -36,6 +36,7 @@ public class IServicesRegistry {
public static final String service_class = IStateServices.service_class;
public static final String service_healthy = IStateServices.service_healthy;
public static final String service_state = IStateServices.service_state;
+ public static final String last_use = IStateServices.last_use;
public static final String service_statistics = IStateServices.service_statistics;
public static final String service_type = IStateServices.service_type;
public static final String submit_error = IStateServices.submit_error;
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=1584458&r1=1584457&r2=1584458&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 Thu Apr 3 23:12:24 2014
@@ -940,6 +940,12 @@ public class DuccHandlerClassic extends
String state = DuccHandlerUtils.getUninterpreted(propertiesMeta, IServicesRegistry.service_state);
sb.append(state);
sb.append("</td>");
+ // Last Used
+ sb.append("<td>");
+ String lastUse = DuccHandlerUtils.getUninterpreted(propertiesMeta, IServicesRegistry.last_use);
+ duccLogger.info(methodName, jobid, "last use: "+lastUse);
+ sb.append(getTimeStamp(request, jobid, lastUse));
+ sb.append("</td>");
// Pinging
sb.append("<td>");
String pinging = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.ping_active);
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=1584458&r1=1584457&r2=1584458&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 Thu Apr 3 23:12:24 2014
@@ -1084,6 +1084,10 @@ public class DuccHandlerJsonFormat exten
}
}
row.add(new JsonPrimitive(s0+s1+s2));
+ // Last Used
+ String lastUse = DuccHandlerUtils.getUninterpreted(propertiesMeta, IServicesRegistry.last_use);
+ String time = getTimeStamp(request, jobid, lastUse);
+ row.add(new JsonPrimitive(time));
// Pinging
String pinging = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.ping_active);
String decoratedPinging = DuccHandlerUtils.getDecorated(pinging);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp?rev=1584458&r1=1584457&r2=1584458&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp Thu Apr 3 23:12:24 2014
@@ -108,6 +108,7 @@ if (table_style.equals("scroll")) {
<th title="The service name">Name</th>
<th title="The service type">Type</th>
<th title="The service state">State</th>
+ <th title="The time this service was last used">Last Use</th>
<th title="The service pinger">Pinger</th>
<th title="The service health">Health</th>
<th title="The service number of instances">Instances</th>
@@ -143,6 +144,7 @@ if (table_style.equals("classic")) {
<th title="The service name">Name</th>
<th title="The service type">Type</th>
<th title="The service state">State</th>
+ <th title="The time this service was last used">Last Use</th>
<th title="The service pinger">Pinger</th>
<th title="The service health">Health</th>
<th title="The service number of instances">Instances</th>