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/02/05 18:06:24 UTC
svn commit: r1823221 - in
/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport:
configuration/jp/ configuration/service/ dispatcher/
Author: cwiklik
Date: Mon Feb 5 18:06:24 2018
New Revision: 1823221
URL: http://svn.apache.org/viewvc?rev=1823221&view=rev
Log:
UIMA-5720 removed printing to stdout
Modified:
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessEventListener.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/UimaServiceThreadFactory.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/ProcessStateDispatcher.java
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java Mon Feb 5 18:06:24 2018
@@ -282,7 +282,6 @@ public class DuccHttpClient {
if ( statusLine.getStatusCode() != 200) {
logger.error("execute", null, "Unable to Communicate with JD - Error:"+statusLine);
logger.error("execute", null, "Content causing error:"+content);
- System.out.println("Thread::"+Thread.currentThread().getId()+" ERRR::Content causing error:"+content);
throw new RuntimeException("JP Http Client Unable to Communicate with JD - Error:"+statusLine);
}
logger.debug("execute", null, "Thread:"+Thread.currentThread().getId()+" JD Reply Status:"+statusLine);
@@ -373,26 +372,16 @@ public class DuccHttpClient {
// do a POST instead of a GET.
transaction.setType(Type.Get); // Tell JD you want a Work Item
//String command = Type.Get.name();
- System.out.println("HttpWorkerThread.run() "+ "Thread Id:"+Thread.currentThread().getId()+" Requesting next WI from JD");;
// send a request to JD and wait for a reply
transaction = client.execute(transaction, postMethod);
// The JD may not provide a Work Item to process.
if ( transaction.getMetaCas()!= null) {
- System.out.println("run Thread:"+Thread.currentThread().getId()+" Recv'd WI:"+transaction.getMetaCas().getSystemKey());
- System.out.println("CAS:"+transaction.getMetaCas().getUserSpaceCas());
// Confirm receipt of the CAS.
transaction.setType(Type.Ack);
//command = Type.Ack.name();
tid = new TransactionId(seq.incrementAndGet(), minor++);
transaction.setTransactionId(tid);
- System.out.println("run Thread:"+Thread.currentThread().getId()+" Sending ACK request - WI:"+transaction.getMetaCas().getSystemKey());
transaction = client.execute(transaction, postMethod);
- if ( transaction.getMetaCas() == null) {
- // this can be the case when a JD receives ACK late
- System.out.println("run Thread:"+Thread.currentThread().getId()+" ACK reply recv'd, however there is no MetaCas. The JD Cancelled the transaction");
- } else {
- System.out.println("run Thread:"+Thread.currentThread().getId()+" ACK reply recv'd");
- }
}
transaction.setType(Type.End);
@@ -405,7 +394,6 @@ public class DuccHttpClient {
metricsWrapper.set(Arrays.asList(new Properties()));
transaction.getMetaCas().setPerformanceMetrics(metricsWrapper);
- System.out.println("run Thread:"+Thread.currentThread().getId()+" Sending END request - WI:"+transaction.getMetaCas().getSystemKey());
transaction = client.execute(transaction, postMethod);
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java Mon Feb 5 18:06:24 2018
@@ -121,7 +121,6 @@ public class HttpWorkerThread implements
}
} catch( SocketTimeoutException e) {
logger.warn("run", null, "Timed Out While Awaiting Response from JD for "+command+" Request - Retrying ...");
- System.out.println("Time Out While Waiting For a Reply from JD For "+command+" Request");
}
return transaction;
@@ -154,7 +153,7 @@ public class HttpWorkerThread implements
synchronized(HttpWorkerThread.class) {
Method deployMethod = processorInstance.getClass().getSuperclass().getDeclaredMethod("deploy");
deployMethod.invoke(processorInstance);
- System.out.println(".... Deployed Processing Container - Initialization Successful - Thread "+Thread.currentThread().getId());
+ logger.info("HttpWorkerThread.run()", null,".... Deployed Processing Container - Initialization Successful - Thread "+Thread.currentThread().getId());
}
// each thread needs its own PostMethod
@@ -168,7 +167,7 @@ public class HttpWorkerThread implements
duccComponent.setState(ProcessState.FailedInitialization);
}
logger.error("HttpWorkerThread.run()", null, t);
- System.out.println("EXITING WorkThread ID:"
+ logger.info("HttpWorkerThread.run()", null,"EXITING WorkThread ID:"
+ Thread.currentThread().getId());
logger.warn("HttpWorkerThread.run()", null, "The Job Process Terminating Due To Initialization Error");
/* *****************************************/
@@ -446,12 +445,9 @@ public class HttpWorkerThread implements
return;
} catch (Exception e ) {
logger.error("run", null, e);
- e.printStackTrace();
// If max framework error count has been reached
// just exit the process
if ( maxFrameworkFailures.decrementAndGet() <= 0 ) {
- System.out.println("Exiting Process Due to a Framework error");
- System.out.flush();
logger.error("run", null, "The Job Process Terminating Due To a Framework Error");
Runtime.getRuntime().halt(-1);
}
@@ -462,13 +458,10 @@ public class HttpWorkerThread implements
}
} catch (Throwable t) {
- t.printStackTrace();
logger.error("run", null, t);
} finally {
logger.warn("run",null,"EXITING WorkThread ID:"
+ Thread.currentThread().getId());
- System.out.println("EXITING WorkThread ID:"
- + Thread.currentThread().getId());
try {
// Determine if the Worker thread has thread affinity to specific AE
// instance. This depends on the process container. If this process
@@ -483,7 +476,7 @@ public class HttpWorkerThread implements
stopMethod.invoke(processorInstance);
}
} catch( Throwable t) {
- t.printStackTrace();
+ logger.warn("run",null,t);
} finally {
workerThreadCount.countDown();
}
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java Mon Feb 5 18:06:24 2018
@@ -93,11 +93,6 @@ implements IJobProcessor{
}
try {
stateLock.lock();
-/*
- if ( currentState.name().equals(ProcessState.FailedInitialization.name()) ) {
- return;
- }
- */
if ( message == null ) {
message = super.getProcessJmxUrl();
}
@@ -304,7 +299,6 @@ implements IJobProcessor{
// initialize http client's timeout
//httpClient.setTimeout(timeout);
- System.out.println("JMX Connect String:"+ processJmxUrl);
getLogger().info("start", null, "Starting "+scaleout+" Process Threads - JMX Connect String:"+ processJmxUrl);
// Create and start worker threads that pull Work Items from the JD
@@ -331,14 +325,15 @@ implements IJobProcessor{
monitor.updateAgentWhenRunning(); // force final publication
executor.shutdown();
} catch( Exception ee) {
- ee.printStackTrace();
+ logger.error("start", null,ee);
}
}
for( Future<?> future : threadHandles ) {
future.get(); // wait for each worker thread to exit run()
}
} catch( Exception ee) {
- ee.printStackTrace();
+
+ logger.error("start", null,ee);
getLogger().info("start", null, ">>> Failed to Deploy UIMA Service. Check UIMA Log for Details");
/*
currentState = ProcessState.FailedInitialization;
@@ -391,16 +386,13 @@ implements IJobProcessor{
agent.notify(currentState);
*/
setState(ProcessState.FailedInitialization);
- e.printStackTrace();
+
+ logger.error("start", null,e);
stop();
}
}
-/*
- public void setRunning() {
- currentState = ProcessState.Running;
- }
- */
+
public boolean isRunning() {
stateLock.lock();
try {
@@ -434,12 +426,6 @@ implements IJobProcessor{
}
public void stop() {
setState(ProcessState.Stopping);
- /*
- currentState = ProcessState.Stopping;
- if ( agent != null ) {
- agent.notify(currentState);
- }
- */
if ( super.isStopping() ) {
return; // already stopping - nothing to do
}
@@ -449,7 +435,7 @@ implements IJobProcessor{
// block until all worker threads exit run()
workerThreadCount.await();
}
- System.out.println("... JobProcessComponent - All Worker Threads Exited run()");
+ logger.info("stop",null,"... JobProcessComponent - All Worker Threads Exited run()");
// Stop executor. It was only needed to poll AE initialization status.
// Since deploy() completed
// the UIMA AS service either succeeded initializing or it failed. In
@@ -469,7 +455,7 @@ implements IJobProcessor{
httpClient.stop();
}
} catch( Exception e) {
- e.printStackTrace();
+ logger.error("stop",null,e);
} finally {
try {
super.stop();
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java Mon Feb 5 18:06:24 2018
@@ -26,7 +26,6 @@ import org.apache.uima.ducc.common.conta
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.container.jp.JobProcessManager;
import org.apache.uima.ducc.transport.DuccTransportConfiguration;
-import org.apache.uima.ducc.transport.agent.ProcessStateUpdate;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -44,54 +43,10 @@ public class JobProcessConfiguration {
JobProcessComponent duccComponent = null;
JobProcessManager jobProcessManager = null;
AgentSession agent = null;
- // protected ProcessState currentState = ProcessState.Undefined;
- // protected ProcessState previousState = ProcessState.Undefined;
RouteBuilder routeBuilder;
CamelContext camelContext;
- /**
- * Creates Camel Router to handle incoming messages
- *
- * @param delegate
- * - {@code AgentEventListener} to delegate messages to
- *
- * @return {@code RouteBuilder} instance
- */
- /*
- public synchronized RouteBuilder routeBuilderForIncomingRequests(
- final String thisNodeIP, final JobProcessEventListener delegate) {
- return new RouteBuilder() {
- // Custom filter to select messages that are targeted for this
- // process. Checks the Node IP in a message to determine if
- // this process is the target.
- Predicate filter = new DuccProcessFilter(thisNodeIP);
-
- public void configure() throws Exception {
- System.out
- .println("Service Wrapper Starting Request Channel on Endpoint:"
- + common.managedServiceEndpoint);
- onException(Exception.class).handled(true)
- .process(new ErrorProcessor()).end();
- from(common.managedServiceEndpoint)
-
- .choice().when(filter).bean(delegate).end()
- .setId(common.managedServiceEndpoint);
-
- }
- };
- }
-
- public class ErrorProcessor implements Processor {
-
- public void process(Exchange exchange) throws Exception {
- // the caused by exception is stored in a property on the exchange
- Throwable caused = exchange.getProperty(Exchange.EXCEPTION_CAUGHT,
- Throwable.class);
- caused.printStackTrace();
- }
- }
- */
private void checkPrereqs() {
boolean uimaAsJob = false;
@@ -155,7 +110,6 @@ public class JobProcessConfiguration {
try {
checkPrereqs();
} catch(Exception e) {
- e.printStackTrace();
throw e;
}
try {
@@ -245,15 +199,11 @@ public class JobProcessConfiguration {
if ( disableAgentUpdates ) {
agent.disable(disableAgentUpdates);
}
- System.out
- .println("#######################################################");
- System.out.println("## Agent Service State Update Endpoint:"
+ duccComponent.getLogger().info("getProcessManagerInstance", null,"#######################################################");
+ duccComponent.getLogger().info("getProcessManagerInstance", null,"## Agent Service State Update Endpoint:"
+ common.managedProcessStateUpdateEndpoint + " ##");
- System.out
- .println("#######################################################");
- // jobProcessManager = new JobProcessManager();
+ duccComponent.getLogger().info("getProcessManagerInstance", null,"#######################################################");
duccComponent.setAgentSession(agent);
- // duccComponent.setJobProcessManager(jobProcessManager);
duccComponent.setSaxonJarPath(common.saxonJarPath);
duccComponent.setDd2SpringXslPath(common.dd2SpringXslPath);
if ( common.processThreadSleepTime != null ) {
@@ -267,18 +217,9 @@ public class JobProcessConfiguration {
"Overriding Default Process Request Timeout - New Timeout "+common.processRequestTimeout+" ms");
}
- /*
- JobProcessEventListener eventListener = new JobProcessEventListener(
- duccComponent);
- routeBuilder = this.routeBuilderForIncomingRequests(thisNodeIP,
- eventListener);
-
- camelContext.addRoutes(routeBuilder);
- */
return duccComponent;
} catch (Exception e) {
- e.printStackTrace();
throw e;
}
}
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessEventListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessEventListener.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessEventListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessEventListener.java Mon Feb 5 18:06:24 2018
@@ -18,7 +18,6 @@
*/
package org.apache.uima.ducc.transport.configuration.jp;
-//import org.apache.uima.ducc.agent.deploy.ManagedService;
import org.apache.camel.Body;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
import org.apache.uima.ducc.transport.event.ProcessStopDuccEvent;
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/UimaServiceThreadFactory.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/UimaServiceThreadFactory.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/UimaServiceThreadFactory.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/UimaServiceThreadFactory.java Mon Feb 5 18:06:24 2018
@@ -45,8 +45,8 @@ public class UimaServiceThreadFactory im
private final int poolId = poolIdGenerator.incrementAndGet();
- public UimaServiceThreadFactory(ThreadGroup tGroup) { //, BaseUIMAAsynchronousEngine_impl uimaASClient) {
-
+ public UimaServiceThreadFactory(ThreadGroup tGroup) {
+
theThreadGroup = tGroup;
}
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceComponent.java Mon Feb 5 18:06:24 2018
@@ -162,8 +162,7 @@ public class ServiceComponent extends Ab
Method deployMethod = processorInstance.getClass().getSuperclass()
.getDeclaredMethod("deploy");
deployMethod.invoke(processorInstance);
- System.out
- .println(".... Deployed Processing Container - Initialization Successful - Thread "
+ getLogger().info("start", null,".... Deployed Processing Container - Initialization Successful - Thread "
+ Thread.currentThread().getId());
// if initialization was successful, tell the agent that the JP is
@@ -184,7 +183,7 @@ public class ServiceComponent extends Ab
}
} catch (Exception ee) {
- ee.printStackTrace();
+ getLogger().error("start", null,ee);
currentState = ProcessState.FailedInitialization;
getLogger()
.info("start", null,
@@ -212,7 +211,7 @@ public class ServiceComponent extends Ab
return; // already stopping - nothing to do
}
- System.out.println("... ServiceComponent - Stopping Service Adapter");
+ getLogger().info("stop", null, "... ServiceComponent - Stopping Service Adapter");
try {
exitLatch.countDown(); // count down the exit latch so this process can exit
// Stop executor. It was only needed to poll AE initialization
@@ -230,7 +229,7 @@ public class ServiceComponent extends Ab
agent.stop();
}
} catch (Exception e) {
- e.printStackTrace();
+ getLogger().error("stop", null, e);
} finally {
try {
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java Mon Feb 5 18:06:24 2018
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.container.FlagsHelper;
+import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.ducc.transport.DuccExchange;
import org.apache.uima.ducc.transport.DuccTransportConfiguration;
@@ -42,6 +43,8 @@ import org.springframework.context.annot
@Import({ DuccTransportConfiguration.class, CommonConfiguration.class })
public class ServiceConfiguration {
public static final String AGENT_ENDPOINT = "mina:tcp://localhost:";
+ protected static DuccLogger logger =
+ new DuccLogger(ServiceConfiguration.class);
@Autowired
DuccTransportConfiguration transport;
@@ -50,8 +53,6 @@ public class ServiceConfiguration {
ServiceComponent duccComponent = null;
CamelContext camelContext;
AgentSession agent = null;
- // protected ProcessState currentState = ProcessState.Undefined;
- // protected ProcessState previousState = ProcessState.Undefined;
RouteBuilder routeBuilder;
/**
* Creates Camel Router to handle incoming messages
@@ -70,9 +71,6 @@ public class ServiceConfiguration {
Predicate filter = new DuccProcessFilter(thisNodeIP);
public void configure() throws Exception {
- System.out
- .println("Service Wrapper Starting Request Channel on Endpoint:"
- + common.managedServiceEndpoint);
onException(Exception.class).handled(true)
.process(new ErrorProcessor()).end();
@@ -91,50 +89,13 @@ public class ServiceConfiguration {
// the caused by exception is stored in a property on the exchange
Throwable caused = exchange.getProperty(Exchange.EXCEPTION_CAUGHT,
Throwable.class);
- caused.printStackTrace();
+ logger.error("process", null, caused);
}
}
private void checkPrereqs() {
-/*
- boolean uimaAsJob = false;
- if (null == System.getProperty(FlagsHelper.Name.JpType.pname())) { // "Ducc.Job.Type")
- throw new RuntimeException("Missing Job Type. Add -D"
- + FlagsHelper.Name.JpType.pname() + "=uima-as or "
- + FlagsHelper.Name.JpType.pname()
- + "=uima. Check your command line");
- } else {
- String jobType = System
- .getProperty(FlagsHelper.Name.JpType.pname());
- if (jobType.trim().equals("uima-as")) {
- uimaAsJob = true;
- } else if (!jobType.trim().equals("uima") && !jobType.trim().equals("custom")) {
- throw new RuntimeException("Invalid value for -D"
- + FlagsHelper.Name.JpType.pname()
- + ". Expected uima-as,uima or custom, Instead it is "
- + jobType);
- }
- }
-
- if (null == System.getProperty(FlagsHelper.Name.JpDuccClasspath.pname())) {
- throw new RuntimeException("Missing the -D"
- + FlagsHelper.Name.JpDuccClasspath.pname() + "=XXXX property");
- }
- if (uimaAsJob && null == common.saxonJarPath) {
- throw new RuntimeException(
- "Missing saxon jar path. Check your ducc.properties");
- }
- if (uimaAsJob && null == common.dd2SpringXslPath) {
- throw new RuntimeException(
- "Missing dd2spring xsl path. Check your ducc.properties");
- }
- if (null == System.getProperty(FlagsHelper.Name.JdURL.pname())) {
- throw new RuntimeException("Missing the -D"
- + FlagsHelper.Name.JdURL.pname() + " property");
- }
-*/
}
public String getUserContainerClassForJob(String key) {
@@ -160,7 +121,6 @@ public class ServiceConfiguration {
try {
checkPrereqs();
} catch(Exception e) {
- e.printStackTrace();
throw e;
}
try {
@@ -236,20 +196,11 @@ public class ServiceConfiguration {
if ( disableAgentUpdates ) {
agent.disable(disableAgentUpdates);
}
- System.out
- .println("#######################################################");
- System.out.println("## Agent Service State Update Endpoint:"
- + common.managedProcessStateUpdateEndpoint + " ##");
- System.out
- .println("#######################################################");
-
duccComponent = new ServiceComponent("UimaProcess",
camelContext, this);
- // jobProcessManager = new JobProcessManager();
duccComponent.setAgentSession(agent);
- // duccComponent.setJobProcessManager(jobProcessManager);
duccComponent.setSaxonJarPath(common.saxonJarPath);
duccComponent.setDd2SpringXslPath(common.dd2SpringXslPath);
@@ -264,8 +215,8 @@ public class ServiceConfiguration {
return duccComponent;
} catch (Exception e) {
- e.printStackTrace();
- throw e;
+ logger.error("getServiceInstance",null,e);
+ throw e;
}
}
private class DuccProcessFilter implements Predicate {
@@ -276,7 +227,6 @@ public class ServiceConfiguration {
}
public synchronized boolean matches(Exchange exchange) {
- // String methodName="DuccProcessFilter.matches";
boolean result = false;
try {
String pid = (String) exchange.getIn().getHeader(
@@ -288,12 +238,9 @@ public class ServiceConfiguration {
// and the node match target process.
if (Utils.getPID().equals(pid) && thisNodeIP.equals(targetIP)) {
result = true;
- System.out
- .println(">>>>>>>>> Process Received a Message. Is Process target for message:"
- + result + ". Target PID:" + pid);
}
} catch (Throwable e) {
- e.printStackTrace();
+ logger.error("matches",null,e);
}
return result;
}
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/ProcessStateDispatcher.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/ProcessStateDispatcher.java?rev=1823221&r1=1823220&r2=1823221&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/ProcessStateDispatcher.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/dispatcher/ProcessStateDispatcher.java Mon Feb 5 18:06:24 2018
@@ -54,7 +54,7 @@ public class ProcessStateDispatcher {
} catch( NumberFormatException nfe) {
}
}
- System.out.println("Service Connecting Socket to Host:"+host.getHostName()+" Port:"+statusUpdatePort);
+ //System.out.println("Service Connecting Socket to Host:"+host.getHostName()+" Port:"+statusUpdatePort);
String localhost=null;
//establish socket connection to an agent where this process will report its state
return new Socket(localhost, statusUpdatePort);
@@ -74,7 +74,7 @@ public class ProcessStateDispatcher {
out = new DataOutputStream(socket.getOutputStream());
out.writeUTF(sb.toString());
out.flush();
- System.out.println("Sent new State:"+state);
+ //System.out.println("Sent new State:"+state);
} catch( Exception e) {
throw e;
} finally {