svn commit: r1467256 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm: PingDriver.java UimaAsPing.java

[ch...@apache.org]

Author: challngr
Date: Fri Apr 12 13:06:36 2013
New Revision: 1467256

URL: http://svn.apache.org/r1467256
Log:
UIMA-2807
Don't reset ping on reference - the internal pingers run on a clock now.

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/UimaAsPing.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=1467256&r1=1467255&r2=1467256&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 Fri Apr 12 13:06:36 2013
@@ -147,6 +147,8 @@ class PingDriver
 
     public void reference()
     {
+        if ( this.ping_class == null ) return;   // internal ping, doesn't need this kludge
+
         synchronized(ping_rate_sync) {
             meta_ping_rate = 500;
         }
@@ -162,13 +164,18 @@ class PingDriver
 
     public void run()
     {
+    	String methodName = "run";
         if ( this.ping_class == null ) {
             // This is the default ping driver, as configured in ducc.propeties, to be run in
             // an in-process thread
+            logger.info(methodName, sset.getId(), "Starting INTERNAL ping.");
             runAsThread();
+            logger.info(methodName, sset.getId(), "Ending INTERNAL ping.");
         } else {
             // The user specified a pinger, run it as an extranal process under that user's identity
+            logger.info(methodName, sset.getId(), "Starting EXTERNAL ping.");
             runAsProcess();
+            logger.info(methodName, sset.getId(), "Ending EXTERNAL ping.");
         }
 
     }
@@ -206,7 +213,6 @@ class PingDriver
     {
     	String methodName = "runAsThread";
         UimaAsPing uap = new UimaAsPing(logger);
-        logger.info(methodName, sset.getId(), "Starting INTERNAL ping.");
         try {
             uap.init(endpoint);
         } catch ( Throwable t ) {
@@ -234,7 +240,6 @@ class PingDriver
     public void runAsProcess() 
     {
         String methodName = "run";
-        logger.info(methodName, sset.getId(), "Starting EXTERNAL ping.");
 
         try {
             pinger =  new PingThread();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/UimaAsPing.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/UimaAsPing.java?rev=1467256&r1=1467255&r2=1467256&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/UimaAsPing.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/UimaAsPing.java Fri Apr 12 13:06:36 2013
@@ -141,7 +141,7 @@ public class UimaAsPing
             // System.out.println("getMeta ok: " + ep);
 
         } catch( ResourceInitializationException e) {
-            doLog(methodName, "Cannot issue getMeta: " + e.toString());
+            doLog(methodName, "Cannot issue getMeta to: " + endpoint + ":" + broker);
         } finally {
             uimaAsEngine.stop();
         }