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/06 20:35:55 UTC
svn commit: r1823387 - in /uima/uima-ducc/trunk:
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/
uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/
Author: cwiklik
Date: Tue Feb 6 20:35:54 2018
New Revision: 1823387
URL: http://svn.apache.org/viewvc?rev=1823387&view=rev
Log:
UIMA-5720 found few more places where stdout is used for logging. Fixed
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.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-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java?rev=1823387&r1=1823386&r2=1823387&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java Tue Feb 6 20:35:54 2018
@@ -113,7 +113,7 @@ public class DuccService extends Abstrac
*/
private void exitIfInvalid( String componentName, String classToVerify, String reason) {
if ( classToVerify == null || classToVerify.trim().length() == 0) {
- System.out.println("Unable to start Component: "+componentName+". Missing "+reason+".\nUsage: java -DServiceConfigurationClass=<Configuration.class> ...");
+ getLogger().error("exitIfInvalid", null,"Unable to start Component: "+componentName+". Missing "+reason+".\nUsage: java -DServiceConfigurationClass=<Configuration.class> ...");
System.exit(-1);
}
}
@@ -155,7 +155,7 @@ public class DuccService extends Abstrac
// property file can be overriden with -D<key>=<value>
loadProperties(DUCC_PROPERTY_FILE);
- System.out.println(System.getProperties());
+ getLogger().info("boot",null,System.getProperties());
// Extract component configuration classes available in System properties
Class<?>[] configClasses = getComponentsToLoad();
// Configure via Spring DI using named Spring's Java Config magic.
@@ -180,7 +180,7 @@ public class DuccService extends Abstrac
getDuccLogger().info(methodName, null, "... Component started: ", duccComponent.getKey());
}
}
- System.out.println("Starting Camel. Use ctrl + c to terminate the JVM.\n");
+ getDuccLogger().info(methodName, null,"Starting Camel. Use ctrl + c to terminate the JVM.\n");
// run until you terminate the JVM
getDuccLogger().info(methodName, null, "Starting Camel. Use ctrl + c to terminate the JVM.\n");
main.start();
@@ -272,7 +272,7 @@ public class DuccService extends Abstrac
private static void setLoggerComponent() {
String deployFlag = "ducc.deploy.components";
String myType = System.getProperty(deployFlag);
- System.out.println("myType:"+myType+".");
+ //System.out.println("myType:"+myType+".");
if(myType != null) {
if(myType.equals("ws")) {
DuccLogger.setDaemonComponent(IDuccLoggerComponents.abbrv_webServer);
@@ -340,7 +340,7 @@ public class DuccService extends Abstrac
Logger logger = (Logger) loggers.nextElement();
if ( logger.getName().equals(clz)) {
logger.setLevel(Level.toLevel(level));
- System.out.println("---------Set New Log Level:"+level+" For Logger:"+clz);
+ //System.out.println("---------Set New Log Level:"+level+" For Logger:"+clz);
}
}
}
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=1823387&r1=1823386&r2=1823387&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 Tue Feb 6 20:35:54 2018
@@ -198,11 +198,12 @@ public class JobProcessConfiguration {
common.managedServiceEndpoint);
if ( disableAgentUpdates ) {
agent.disable(disableAgentUpdates);
+ } else {
+ duccComponent.getLogger().info("getProcessManagerInstance", null,"#######################################################");
+ duccComponent.getLogger().info("getProcessManagerInstance", null,"## Agent Service State Update Endpoint:"
+ + common.managedProcessStateUpdateEndpoint + " ##");
+ duccComponent.getLogger().info("getProcessManagerInstance", null,"#######################################################");
}
- duccComponent.getLogger().info("getProcessManagerInstance", null,"#######################################################");
- duccComponent.getLogger().info("getProcessManagerInstance", null,"## Agent Service State Update Endpoint:"
- + common.managedProcessStateUpdateEndpoint + " ##");
- duccComponent.getLogger().info("getProcessManagerInstance", null,"#######################################################");
duccComponent.setAgentSession(agent);
duccComponent.setSaxonJarPath(common.saxonJarPath);
duccComponent.setDd2SpringXslPath(common.dd2SpringXslPath);
Modified: uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java?rev=1823387&r1=1823386&r2=1823387&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java Tue Feb 6 20:35:54 2018
@@ -95,7 +95,8 @@ public class UimaASProcessContainer ext
System.setProperty(queuePropertyName, endpointName);
String jobType = System.getProperty("ducc.deploy.JpType");
if ( "uima-as".equals(jobType)) {
- System.out.println("UIMA-AS Version:"+UimaAsVersion.getFullVersionString());
+ Logger logger = UIMAFramework.getLogger();
+ logger.log(Level.INFO,"UIMA-AS Version:"+UimaAsVersion.getFullVersionString());
}
// enable performance breakdown reporting when support is added in the next UIMA AS release after 2.6.0
// (assumes the fix will be after the current 2.6.1-SNAPSHOT level)
@@ -136,8 +137,8 @@ public class UimaASProcessContainer ext
// below code runs once to create broker, uima-as client and
// uima-as service
if ( brokerInstance == null ) {
-
- System.out.println("UIMA-AS Version::"+UimaAsVersion.getFullVersionString());
+ Logger logger = UIMAFramework.getLogger();
+ logger.log(Level.INFO, "UIMA-AS Version::"+UimaAsVersion.getFullVersionString());
// isolate broker by loading it in its own Class Loader
// Sets the brokerInstance
deployBroker(duccHome);
@@ -160,7 +161,7 @@ public class UimaASProcessContainer ext
} catch ( Throwable e) {
Logger logger = UIMAFramework.getLogger();
logger.log(Level.WARNING, "UimaProcessContainer", e);
- e.printStackTrace();
+ //e.printStackTrace();
throw new RuntimeException(e);
} finally {
@@ -188,7 +189,7 @@ public class UimaASProcessContainer ext
classToLaunch = ucl.loadClass("org.apache.activemq.broker.BrokerService");
if (System.getProperty("ducc.debug") != null) {
- System.out.println("Classpath for the internal broker");
+ //System.out.println("Classpath for the internal broker");
DuccJobService.dump(ucl, 4);
}
brokerInstance = classToLaunch.newInstance();
@@ -263,17 +264,19 @@ public class UimaASProcessContainer ext
try {
synchronized(UimaASProcessContainer.class) {
if ( brokerRunning ) {
- System.out.println("Stopping UIMA_AS Client");
+ Logger logger = UIMAFramework.getLogger();
+ logger.log(Level.INFO,"Stopping UIMA_AS Client");
try {
// Prevent UIMA-AS from exiting
System.setProperty("dontKill", "true");
uimaASClient.stop();
} catch (Exception e) {
- e.printStackTrace();
+ //logger.log(Level.SEVERE,e);
+ logger.log(Level.WARNING, "doStop", e);
}
- System.out.println("Stopping Broker");
+ //System.out.println("Stopping Broker");
Method stopMethod = classToLaunch.getMethod("stop");
stopMethod.invoke(brokerInstance);
@@ -438,7 +441,7 @@ public class UimaASProcessContainer ext
try {
// use UIMA-AS client to deploy the service using provided
// Deployment Descriptor
- System.out.println("---------------- BROKER URL:::"+System.getProperty(brokerPropertyName));
+ //System.out.println("---------------- BROKER URL:::"+System.getProperty(brokerPropertyName));
ClassLoader duccCl = Thread.currentThread().getContextClassLoader();
ClassLoader cl = this.getClass().getClassLoader();
Thread.currentThread().setContextClassLoader(cl);
@@ -560,9 +563,9 @@ public class UimaASProcessContainer ext
}
public void onUimaAsServiceExit(EventTrigger cause) {
- System.out
- .println("runTest: Received onUimaAsServiceExit() Notification With Cause:"
- + cause.name());
+ //System.out
+ // .println("runTest: Received onUimaAsServiceExit() Notification With Cause:"
+ // + cause.name());
}
public synchronized void entityProcessComplete(CAS aCAS,
Modified: uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java?rev=1823387&r1=1823386&r2=1823387&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java Tue Feb 6 20:35:54 2018
@@ -98,7 +98,7 @@ public class UimaProcessContainer extend
analysisEngineDescriptor = ArgsParser.getArg("-aed", args);
if (analysisEngineDescriptor == null || !new File(analysisEngineDescriptor).canRead()) {
analysisEngineDescriptor = buildDeployable();
- System.out.println("Created descriptor: "+analysisEngineDescriptor);
+ //System.out.println("Created descriptor: "+analysisEngineDescriptor);
}
String threadCount = ArgsParser.getArg("-t", args); // Will be null if ducc.deploy.JpThreadCount is undefined
scaleout = threadCount==null ? 1 : Integer.valueOf(threadCount); // Default to 1
@@ -112,7 +112,7 @@ public class UimaProcessContainer extend
public void doDeploy() throws Exception {
- System.out.println("....... UimaProcessContainer.doDeploy()");
+ //System.out.println("....... UimaProcessContainer.doDeploy()");
ResourceSpecifier rSpecifier = null;
HashMap<String,Object> paramsMap =
new HashMap<String,Object>();
@@ -153,7 +153,7 @@ public class UimaProcessContainer extend
latch.countDown();
Logger logger = UIMAFramework.getLogger();
logger.log(Level.WARNING, "UimaProcessContainer", e);
- e.printStackTrace();
+ //e.printStackTrace();
throw new RuntimeException(e);
} finally {
@@ -169,7 +169,8 @@ public class UimaProcessContainer extend
ae.destroy();
}
} catch( Exception e) {
- e.printStackTrace();
+ Logger logger = UIMAFramework.getLogger();
+ logger.log(Level.WARNING, "doStop", e);
} finally {
}
}