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 2017/03/17 13:30:43 UTC
svn commit: r1787369 - in
/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccAbstractHandler.java IWebMonitor.java
Author: degenaro
Date: Fri Mar 17 13:30:43 2017
New Revision: 1787369
URL: http://svn.apache.org/viewvc?rev=1787369&view=rev
Log:
UIMA-5373 DUCC Web Server (WS) add clarity to MonitorWarning hover text for Jobs & Reservations
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1787369&r1=1787368&r2=1787369&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java Fri Mar 17 13:30:43 2017
@@ -947,6 +947,7 @@ public abstract class DuccAbstractHandle
}
protected String getMonitor(DuccId duccId, MonitorType monitorType, boolean multi) {
+ String location = "getMonitor";
StringBuffer sb = new StringBuffer();
DuccWebMonitor duccWebMonitor = DuccWebMonitor.getInstance();
Long expiry = duccWebMonitor.getExpiry(monitorType, duccId);
@@ -962,15 +963,6 @@ public abstract class DuccAbstractHandle
if(multi) {
sb.append(" ");
}
- String t2 = " left until auto-cancel, unless renewed";
- String t1;
- if(expiry == 0) {
- t1 = "less than 1 minute";
- }
- else {
- t1 = expiry+"+ minutes";
- }
- String text = t1+t2;
long expiryWarnTime = 3;
Properties properties = DuccWebProperties.get();
String key = "ducc.ws.job.automatic.cancel.minutes";
@@ -983,15 +975,23 @@ public abstract class DuccAbstractHandle
}
}
catch(Exception e) {
-
+ duccLogger.debug(location, duccId, e);
}
}
+ String base = "submitter's client monitor contact ";
if(expiry > expiryWarnTime) {
- sb.append("<span class=\"health_green\" title=\""+text+"\">");
+ String hover = base+"established";
+ sb.append("<span class=\"health_green\" title=\""+hover+"\">");
sb.append("MonitorActive");
}
else {
- sb.append("<span class=\"health_red\" title=\""+text+"\">");
+ String type = monitorType.getText();
+ String minutes = "less than 1 minute";
+ if(expiry > 1) {
+ minutes = expiry+" minutes";
+ }
+ String hover = base+"lost, "+type+" will be canceled in "+minutes;
+ sb.append("<span class=\"health_red\" title=\""+hover+"\">");
sb.append("MonitorWarning");
}
sb.append("</span>");
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java?rev=1787369&r1=1787368&r2=1787369&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java Fri Mar 17 13:30:43 2017
@@ -25,7 +25,20 @@ import org.apache.uima.ducc.common.utils
public interface IWebMonitor {
- public enum MonitorType { Job, ManagedReservation, UnmanagedReservation };
+ public static String job = "job";
+ public static String reservation = "reservation";
+ public enum MonitorType {
+ Job(job),
+ ManagedReservation(reservation),
+ UnmanagedReservation (reservation);
+ private String text = null;
+ MonitorType(String text) {
+ this.text = text;
+ }
+ public String getText() {
+ return text;
+ }
+ };
public void register(String host, String port);
public boolean isAutoCancelEnabled();