Author: degenaro
Date: Wed Mar 6 20:54:03 2013
New Revision: 1453551
URL: http://svn.apache.org/r1453551
Log:
UIMA-2689 DUCC webserver (WS) auto-cancel feature should not be enabled for
shadows, and should be properly reflected on Jobs page
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.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/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1453551&r1=1453550&r2=1453551&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
Wed Mar 6 20:54:03 2013
@@ -872,4 +872,61 @@ public abstract class DuccAbstractHandle
return retVal;
}
+ protected String getMonitor(DuccId duccId, boolean multi) {
+ StringBuffer sb = new StringBuffer();
+ DuccWebMonitor duccWebMonitor = DuccWebMonitor.getInstance();
+ Long expiry = duccWebMonitor.getExpiry(duccId);
+ if(!duccWebMonitor.isCanceler()) {
+ if(expiry != null) {
+ String text = "webserver not primary";
+ sb.append("<span class=\"health_neutral\"
title=\""+text+"\">");
+ sb.append("MonitorRequested");
+ sb.append("</span>");
+ }
+ }
+ else if(expiry != null) {
+ 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";
+ if(properties.containsKey(key)) {
+ String value = properties.getProperty(key);
+ try {
+ long time = Long.parseLong(value)/2;
+ if(time > 0) {
+ expiryWarnTime = time;
+ }
+ }
+ catch(Exception e) {
+
+ }
+ }
+ if(expiry > expiryWarnTime) {
+ sb.append("<span class=\"health_green\"
title=\""+text+"\">");
+ sb.append("MonitorActive");
+ }
+ else {
+ sb.append("<span class=\"health_red\"
title=\""+text+"\">");
+ sb.append("MonitorWarning");
+ }
+ sb.append("</span>");
+ }
+ else if(duccWebMonitor.isCancelPending(duccId)) {
+ sb.append("<span class=\"health_red\" >");
+ sb.append("CancelPending...");
+ sb.append("</span>");
+ }
+ return sb.toString();
+ }
}
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=1453551&r1=1453550&r2=1453551&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
Wed Mar 6 20:54:03 2013
@@ -192,51 +192,11 @@ public class DuccHandlerJsonFormat exten
sb.append("</span>");
}
sb.append("</span>");
- DuccWebMonitor duccWebMonitor =
DuccWebMonitor.getInstance();
- Long expiry = duccWebMonitor.getExpiry(duccId);
- if(expiry != null) {
- if(multi) {
- sb.append(" ");
- }
+ //
+ String monitor = getMonitor(duccId, multi);
+ if(monitor.length() > 0) {
multi = true;
- 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";
- if(properties.containsKey(key)) {
- String value =
properties.getProperty(key);
- try {
- long time =
Long.parseLong(value)/2;
- if(time > 0) {
- expiryWarnTime = time;
- }
- }
- catch(Exception e) {
-
- }
- }
- if(expiry > expiryWarnTime) {
- sb.append("<span class=\"health_green\"
title=\""+text+"\">");
- sb.append("MonitorActive");
- }
- else {
- sb.append("<span class=\"health_red\"
title=\""+text+"\">");
- sb.append("MonitorWarning");
- }
- sb.append("</span>");
- }
- else if(duccWebMonitor.isCancelPending(duccId)) {
- sb.append("<span class=\"health_red\" >");
- sb.append("CancelPending...");
- sb.append("</span>");
+ sb.append(monitor);
}
}
else if(job.isCompleted()) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1453551&r1=1453550&r2=1453551&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
Wed Mar 6 20:54:03 2013
@@ -174,51 +174,11 @@ public class DuccHandlerLegacy extends D
sb.append("Swapping");
sb.append("</span>");
}
- DuccWebMonitor duccWebMonitor =
DuccWebMonitor.getInstance();
- Long expiry = duccWebMonitor.getExpiry(duccId);
- if(expiry != null) {
- if(multi) {
- sb.append(" ");
- }
+ //
+ String monitor = getMonitor(duccId, multi);
+ if(monitor.length() > 0) {
multi = true;
- 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";
- if(properties.containsKey(key)) {
- String value =
properties.getProperty(key);
- try {
- long time =
Long.parseLong(value)/2;
- if(time > 0) {
- expiryWarnTime = time;
- }
- }
- catch(Exception e) {
-
- }
- }
- if(expiry > expiryWarnTime) {
- sb.append("<span class=\"health_green\"
title=\""+text+"\">");
- sb.append("MonitorActive");
- }
- else {
- sb.append("<span class=\"health_red\"
title=\""+text+"\">");
- sb.append("MonitorWarning");
- }
- sb.append("</span>");
- }
- else if(duccWebMonitor.isCancelPending(duccId)) {
- sb.append("<span class=\"health_red\" >");
- sb.append("CancelPending...");
- sb.append("</span>");
+ sb.append(monitor);
}
sb.append("</td>");
}
