svn commit: r1444101 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/

[ch...@apache.org]

Author: challngr
Date: Fri Feb  8 16:28:52 2013
New Revision: 1444101

URL: http://svn.apache.org/r1444101
Log:
UIMA-2652
Fix cut/paste error for service_linger in CLI.  Also make units of time 
consistent (milliseconds) everywhere linger is used.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IServiceApi.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-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1444101&r1=1444100&r2=1444101&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java Fri Feb  8 16:28:52 2013
@@ -525,7 +525,7 @@ public class DuccServiceApi 
     private String getLinger(DuccProperties props)
     {
         String kw = RegistrationOption.ServiceLinger.decode();
-        String default_linger = ducc_properties.getStringProperty("ducc.sm.default.linger", "30");
+        String default_linger = ducc_properties.getStringProperty("ducc.sm.default.linger", "5000");
         String linger = props.getStringProperty(kw, default_linger);
         long actual = 0;
         try {             
@@ -545,7 +545,6 @@ public class DuccServiceApi 
         // First read the properties file if given in
         //    ducc_services --register propsfile
         String props = cl.getOptionValue(ServiceVerb.Register.decode());
-        debug = true;
         if ( props != null ) {
             reply.load(new FileInputStream(props));
             if ( debug ) {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IServiceApi.java?rev=1444101&r1=1444100&r2=1444101&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IServiceApi.java Fri Feb  8 16:28:52 2013
@@ -228,7 +228,7 @@ public interface IServiceApi
             if ( value.equals(ClasspathOrder.decode()) )       return ClasspathOrder;
             if ( value.equals(Jvm.decode()) )                  return Jvm;
             if ( value.equals(ServiceDependency.decode()) )    return ServiceDependency;
-            if ( value.equals(ServiceDependency.decode()) )    return ServiceDependency;
+            if ( value.equals(ServiceLinger.decode()) )        return ServiceLinger;
             return Unknown;
         }
 

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=1444101&r1=1444100&r2=1444101&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 Fri Feb  8 16:28:52 2013
@@ -111,7 +111,7 @@ public class ServiceSet
     // structures to manage service linger after it exits
     Timer timer = null;
     LingerTask linger = null;
-    long linger_time = 1000;
+    long linger_time = 5000;
 
     //JobState     job_state     = JobState.Undefined;
     //
@@ -170,7 +170,7 @@ public class ServiceSet
         this.props_filename = props_filename;
         this.meta_filename = meta_filename;
         this.service_state = ServiceState.NotAvailable;
-        this.linger_time = props.getLongProperty(RegistrationOption.ServiceLinger.decode(), 5);
+        this.linger_time = props.getLongProperty(RegistrationOption.ServiceLinger.decode(), 5000);
 
         this.key = meta.getProperty("endpoint");