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 2013/08/01 19:58:40 UTC
svn commit: r1509352 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
Author: degenaro
Date: Thu Aug 1 17:58:40 2013
New Revision: 1509352
URL: http://svn.apache.org/r1509352
Log:
UIMA-2727 DUCC webserver (WS) Reason CanceledByDriver should be more specific.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java?rev=1509352&r1=1509351&r2=1509352&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java Thu Aug 1 17:58:40 2013
@@ -759,7 +759,13 @@ public class JobDriver extends Thread im
break;
case JobStop:
duccOut.info(location, workItem.getJobId(), workItem.getProcessId(), message);
- driverStatusReport.killJob(JobCompletionType.CanceledByDriver, new Rationale("job driver received JobStop from plugin error handler"));
+ StringBuffer sb = new StringBuffer();
+ sb.append("job driver received JobStop from plugin error handler");
+ if(directive.hasReason()) {
+ sb.append("with reason: ");
+ sb.append(directive.getReason());
+ }
+ driverStatusReport.killJob(JobCompletionType.CanceledByDriver, new Rationale(sb.toString()));
break;
}
duccOut.debug(location, workItem.getJobId(), workItem.getProcessId(), "retVal:"+retVal);
@@ -1299,7 +1305,13 @@ public class JobDriver extends Thread im
break;
case JobStop:
duccOut.info(location, workItem.getJobId(), workItem.getProcessId(), message);
- driverStatusReport.killJob(JobCompletionType.CanceledByDriver, new Rationale("job driver received JobStop from plugin error handler"));
+ StringBuffer sb = new StringBuffer();
+ sb.append("job driver received JobStop from plugin error handler");
+ if(directive.hasReason()) {
+ sb.append("with reason: ");
+ sb.append(directive.getReason());
+ }
+ driverStatusReport.killJob(JobCompletionType.CanceledByDriver, new Rationale(sb.toString()));
break;
}
}