Author: cwiklik
Date: Tue Oct 22 13:58:49 2013
New Revision: 1534637
URL: http://svn.apache.org/r1534637
Log:
UIMA-3319 set KilledByDucc as a reason when agent kills a process
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java?rev=1534637&r1=1534636&r2=1534637&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
Tue Oct 22 13:58:49 2013
@@ -369,18 +369,20 @@ public class ManagedProcess implements P
String reason = getDuccProcess().getReasonForStoppingProcess();
ProcessState pstate = getDuccProcess().getProcessState();
-
+ boolean initError = (reason != null && (reason
+
.equals(ReasonForStoppingProcess.FailedInitialization
+ .toString()) || reason
+
.equals(ReasonForStoppingProcess.InitializationTimeout
+ .toString())));
if (isKillCmd
||
// if the process is to be killed due to init
problems, set the
// state to Stopped
- (reason != null && (reason
-
.equals(ReasonForStoppingProcess.FailedInitialization
- .toString()) ||
reason
-
.equals(ReasonForStoppingProcess.InitializationTimeout
- .toString()))))
{
+ (reason != null && initError ) ) {
getDuccProcess().setProcessState(ProcessState.Stopped);
-
+ if ( !initError ) {
+
getDuccProcess().setReasonForStoppingProcess(ReasonForStoppingProcess.KilledByDucc.toString());
+ }
} else {
// Process has terminated. Determine why the process
terminated.
log("ManagedProcess.drainProcessStreams", "Ducc Process
with PID:"
@@ -392,6 +394,7 @@ public class ManagedProcess implements P
if ( isAP ) {
// Agent killed the AP process
pstate = ProcessState.Stopped;
+
getDuccProcess().setReasonForStoppingProcess(ReasonForStoppingProcess.KilledByDucc.toString());
} else {
// Agent killed the process due to
timeout waiting for OR state
pstate = ProcessState.Killed;
