You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/04/23 20:46:41 UTC
svn commit: r1471089 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher:
ManagedProcess.java ProcessStreamConsumer.java
Author: cwiklik
Date: Tue Apr 23 18:46:40 2013
New Revision: 1471089
URL: http://svn.apache.org/r1471089
Log:
UIMA-2828 Adds DuccWorkId to a log message
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.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=1471089&r1=1471088&r2=1471089&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 Apr 23 18:46:40 2013
@@ -298,9 +298,9 @@ public class ManagedProcess implements P
// Fetch stderr from the deployed process
InputStream stderr = process.getErrorStream();
// Create dedicated thread to consume std output stream from the process
- stdOutReader = new ProcessStreamConsumer(logger, group, "StdOutputReader", stdin, pStream);
+ stdOutReader = new ProcessStreamConsumer(logger, group, "StdOutputReader", stdin, pStream, workDuccId);
// Create dedicated thread to consume std error stream from the process
- stdErrReader = new ProcessStreamConsumer(logger, group, "StdErrorReader", stderr, pStream);
+ stdErrReader = new ProcessStreamConsumer(logger, group, "StdErrorReader", stderr, pStream, workDuccId);
// Start both stream consumer threads
stdOutReader.start();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java?rev=1471089&r1=1471088&r2=1471089&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java Tue Apr 23 18:46:40 2013
@@ -25,6 +25,7 @@ import java.io.InputStreamReader;
import java.io.PrintStream;
import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.common.utils.id.DuccId;
public class ProcessStreamConsumer extends Thread {
@@ -33,14 +34,17 @@ public class ProcessStreamConsumer exten
private InputStream is;
private PrintStream os;
DuccLogger logger;
+ private DuccId workDuccId;
+
private StringBuffer errStreamBuffer = new StringBuffer();
public ProcessStreamConsumer(DuccLogger logger, ThreadGroup threadGroup,
- final String threadName, InputStream is, PrintStream os) {
+ final String threadName, InputStream is, PrintStream os, DuccId workDuccId) {
super(threadGroup, threadName);
this.os = os;
this.is = is;
this.logger = logger;
setDaemon(true);
+ this.workDuccId = workDuccId;
}
public String getDataFromStream() {
return errStreamBuffer.toString();
@@ -54,13 +58,13 @@ public class ProcessStreamConsumer exten
while ((line = reader.readLine()) != null) {
line += LS;
if ( "StdErrorReader".equals(Thread.currentThread().getName())) {
- logger.error("ProcessStreamConsumer.run()", null, line.trim());
+ logger.error("ProcessStreamConsumer.run()", workDuccId, line.trim());
os.print("ERR>>>"+line);
// Save stderr stream into a local buffer. When the process exits unexpectedly
// errors will be copied to a Process object.
errStreamBuffer.append(line.trim());
} else {
- logger.info("ProcessStreamConsumer.run()", null, line.trim());
+ logger.info("ProcessStreamConsumer.run()", workDuccId, line.trim());
os.print("OUT>>>"+line);
}
}