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 2015/04/29 20:32:27 UTC
svn commit: r1676812 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
Author: degenaro
Date: Wed Apr 29 18:32:27 2015
New Revision: 1676812
URL: http://svn.apache.org/r1676812
Log:
UIMA-4335 DUCC Monitor (CLI) has out-of-order messages
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java?rev=1676812&r1=1676811&r2=1676812&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java Wed Apr 29 18:32:27 2015
@@ -73,8 +73,10 @@ public abstract class DuccMonitor {
private DuccPropertiesResolver duccPropertiesResolver = null;
private DuccContext context = null;
- IDuccCallback messageProcessor = null;
+ protected IDuccCallback messageProcessor = null;
+ private String delayedRunning = null;
+
private SynchronizedSimpleDateFormat sdf = new SynchronizedSimpleDateFormat(
"dd/MM/yyyy HH:mm:ss");
@@ -366,8 +368,26 @@ public abstract class DuccMonitor {
}
thisMessage = message.toString();
if (!thisMessage.equals(lastMessage)) {
- info(thisMessage);
- lastMessage = thisMessage;
+ boolean suppress = false;
+ if(state.equals(StateRunning)) {
+ if(seenRemotePids.size() == 0) {
+ suppress = true;
+ if(delayedRunning == null) {
+ delayedRunning = message.toString();
+ }
+ }
+ else {
+ delayedRunning = null;
+ }
+ }
+ if(!suppress) {
+ if(delayedRunning != null) {
+ info(delayedRunning);
+ delayedRunning = null;
+ }
+ info(thisMessage);
+ lastMessage = thisMessage;
+ }
}
if (state.equals(StateCompleted)) {
// See Jira 2911