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 2018/05/03 23:59:34 UTC
svn commit: r1830873 - in
/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport:
IServiceTransport.java http/HttpServiceTransport.java
Author: cwiklik
Date: Thu May 3 23:59:34 2018
New Revision: 1830873
URL: http://svn.apache.org/viewvc?rev=1830873&view=rev
Log:
UIMA-5756 added requestor info (pid,ip,host,etc)
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/IServiceTransport.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/http/HttpServiceTransport.java
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/IServiceTransport.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/IServiceTransport.java?rev=1830873&r1=1830872&r2=1830873&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/IServiceTransport.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/IServiceTransport.java Thu May 3 23:59:34 2018
@@ -18,6 +18,7 @@
*/
package org.apache.uima.ducc.ps.service.transport;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
import org.apache.uima.ducc.ps.service.IServiceComponent;
import org.apache.uima.ducc.ps.service.errors.ServiceInitializationException;
@@ -29,5 +30,5 @@ public interface IServiceTransport exten
public void initialize() throws ServiceInitializationException;
// stop transport
public void stop();
-
+ public void addRequestorInfo(IMetaTaskTransaction transaction);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/http/HttpServiceTransport.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/http/HttpServiceTransport.java?rev=1830873&r1=1830872&r2=1830873&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/http/HttpServiceTransport.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/http/HttpServiceTransport.java Thu May 3 23:59:34 2018
@@ -27,7 +27,6 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.http.HttpEntity;
@@ -46,6 +45,7 @@ import org.apache.http.impl.client.HttpC
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.util.EntityUtils;
import org.apache.uima.UIMAFramework;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
import org.apache.uima.ducc.ps.service.errors.IServiceErrorHandler.Action;
import org.apache.uima.ducc.ps.service.errors.ServiceException;
import org.apache.uima.ducc.ps.service.errors.ServiceInitializationException;
@@ -172,7 +172,26 @@ public class HttpServiceTransport implem
registryLookupLock.unlock();
}
}
+ public void addRequestorInfo(IMetaTaskTransaction transaction) {
+ transaction.setRequesterAddress(nodeIP);
+ transaction.setRequesterNodeName(nodeName);
+ transaction.setRequesterProcessId(Integer.valueOf(pid));
+ transaction.setRequesterThreadId((int)Thread.currentThread().getId());
+ if ( logger.isLoggable(Level.FINE )) {
+ logger.log(Level.FINE,"ip:"+transaction.getRequesterAddress());
+ logger.log(Level.FINE, "nodeName:"+transaction.getRequesterNodeName());
+ logger.log(Level.FINE, "processName:"+transaction.getRequesterProcessName());
+ logger.log(Level.FINE,"processId:"+transaction.getRequesterProcessId());
+ logger.log(Level.FINE, "threadId:"+transaction.getRequesterThreadId());
+ }
+//
+// transaction.setRequesterNodeName(nodeName);
+// transaction.setRequesterProcessId(pid);
+// transaction.setRequesterProcessName(value);
+// transaction.setRequesterThreadId((int)Thread.currentThread().getId());
+
+ }
public void initialize() throws ServiceInitializationException {
// use plugged in registry to lookup target to connect to.
@@ -286,6 +305,7 @@ public class HttpServiceTransport implem
throw new TransportException(
"Http Client Unable to Communicate with a remote client - Error:" + statusLine);
}
+
stats.incrementSuccessCount();
return serializedResponse;
}
@@ -365,10 +385,10 @@ public class HttpServiceTransport implem
finally {
postMethod.releaseConnection();
}
-
return serializedResponse;
}
+
private Action handleConnectionError(Exception e) {
if ( e instanceof HttpHostConnectException || e instanceof UnknownHostException ) {
synchronized (httpClient) {