You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2014/04/03 22:49:32 UTC
svn commit: r1584391 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm:
PingDriver.java ServiceSet.java
Author: challngr
Date: Thu Apr 3 20:49:31 2014
New Revision: 1584391
URL: http://svn.apache.org/r1584391
Log:
UIMA-3704 Fix bugs in ping/monitor API to change autostart.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java?rev=1584391&r1=1584390&r2=1584391&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java Thu Apr 3 20:49:31 2014
@@ -435,8 +435,9 @@ class PingDriver
void setCommonProperties(Map<String, Object> props)
{
- props.put("all-instances" , sset.getImplementors());
- props.put("active-instances", sset.getActiveInstances());
+ props.put("all-instances" , sset.getImplementors());
+ props.put("active-instances" , sset.getActiveInstances());
+ props.put("autostart-enabled", sset.isAutostart());
DuccId[] references = sset.getReferences();
Long[] refs = new Long[references.length];
@@ -444,8 +445,8 @@ class PingDriver
refs[i] = references[i].getFriendly();
}
- props.put("references" , refs);
- props.put("run-failures" , sset.getRunFailures());
+ props.put("references" , refs);
+ props.put("run-failures" , sset.getRunFailures());
}
void runAsThread()
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1584391&r1=1584390&r2=1584391&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Thu Apr 3 20:49:31 2014
@@ -493,12 +493,12 @@ public class ServiceSet
synchronized void setAutostart(boolean auto)
{
- cancelLinger();
meta_props.setProperty("autostart", auto ? "true" : "false");
this.autostart = auto;
if ( auto ) {
// turning this on gives benefit of the doubt on failure management
// by definition, an autostarted services is NOT reference started
+ cancelLinger();
reference_start = false;
init_failures = 0;
resetRuntimeErrors();