You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2014/07/17 22:09:12 UTC
svn commit: r1611465 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/p...
Author: challngr
Date: Thu Jul 17 20:09:11 2014
New Revision: 1611465
URL: http://svn.apache.org/r1611465
Log:
UIMA-3949 Clean up warnings, add getDuccLogger(name).
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/PropertiesFileManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/history/HistoryPersistenceManager.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java?rev=1611465&r1=1611464&r2=1611465&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java Thu Jul 17 20:09:11 2014
@@ -432,7 +432,7 @@ public class ManagedUimaService extends
componentsToDelete.add(aeState);
}
}
- DuccService.getDuccLogger().debug(
+ DuccService.getDuccLogger(this.getClass().getName()).debug(
"UimaAEJmxMonitor.run()",
null,
"---- AE Name:" + proxy.getName()
@@ -447,7 +447,7 @@ public class ManagedUimaService extends
}
howManySeenSoFar = 1; // reset error counter
if (updateAgent) {
- DuccService.getDuccLogger().debug("UimaAEJmxMonitor.run()", null,
+ DuccService.getDuccLogger(this.getClass().getName()).debug("UimaAEJmxMonitor.run()", null,
"---- Publishing UimaPipelineAEComponent List - size="
+ aeStateList.size());
try {
@@ -466,7 +466,7 @@ public class ManagedUimaService extends
if (!(e.getCause() instanceof InstanceNotFoundException)) {
if (howManySeenSoFar > 3) { // allow up three errors of this
// kind
- DuccService.getDuccLogger().info("UimaAEJmxMonitor.run()", null, e);
+ DuccService.getDuccLogger(this.getClass().getName()).info("UimaAEJmxMonitor.run()", null, e);
howManySeenSoFar = 1;
throw e;
}
@@ -476,7 +476,7 @@ public class ManagedUimaService extends
}
} catch (Throwable e) {
howManySeenSoFar = 1;
- DuccService.getDuccLogger().info("UimaAEJmxMonitor.run()", null, e);
+ DuccService.getDuccLogger(this.getClass().getName()).info("UimaAEJmxMonitor.run()", null, e);
}
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java?rev=1611465&r1=1611464&r2=1611465&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java Thu Jul 17 20:09:11 2014
@@ -72,6 +72,16 @@ public class DuccService extends Abstrac
return globalLogger;
}
+ public static DuccLogger getDuccLogger(String claz)
+ {
+ return globalLogger.getLoggerFor(claz);
+ }
+
+ public static DuccLogger getDuccLogger(@SuppressWarnings("rawtypes") Class claz)
+ {
+ return getDuccLogger(claz.getName());
+ }
+
public static void setDuccLogger(DuccLogger l)
{
globalLogger = l;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/PropertiesFileManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/PropertiesFileManager.java?rev=1611465&r1=1611464&r2=1611465&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/PropertiesFileManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/PropertiesFileManager.java Thu Jul 17 20:09:11 2014
@@ -27,7 +27,6 @@ import java.util.Properties;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.main.DuccService;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
public class PropertiesFileManager implements IPropertiesFileManager {
@@ -43,7 +42,7 @@ public class PropertiesFileManager imple
private boolean storeOnSet = true;
public PropertiesFileManager(String componentId, String basedir, String propertiesFileName) {
- this.logger = DuccLoggerComponents.makeLogger(PropertiesFileManager.class.getName(),componentId);
+ this.logger = DuccService.getDuccLogger(this.getClass().getName());
this.basedir = basedir;
this.propertiesFileName = propertiesFileName;
init();
@@ -51,7 +50,7 @@ public class PropertiesFileManager imple
public PropertiesFileManager(String componentId, String basedir, String propertiesFileName, boolean loadOnGet, boolean storeOnSet) {
// this.logger = DuccLoggerComponents.makeLogger(PropertiesFileManager.class.getName(),componentId);
- this.logger = DuccService.getDuccLogger();
+ this.logger = DuccService.getDuccLogger(this.getClass().getName());
this.basedir = basedir;
this.propertiesFileName = propertiesFileName;
this.loadOnGet = loadOnGet;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java?rev=1611465&r1=1611464&r2=1611465&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java Thu Jul 17 20:09:11 2014
@@ -73,6 +73,58 @@ public class DuccLogger
return new DuccLogger(claz, component);
}
+ // Usually just called by DuccService, with the global component logger as base
+ // This constructs a logger for the given class, and then add all the appenders
+ // from 'this'. Be careful configuring log4j.xml, you probably don't want any
+ // appenders on the class 'claz' or you'll get unexpected extra log files.
+ public DuccLogger getLoggerFor(String claz)
+ {
+ if ( logger == null ) {
+ System.out.println("DuccLogger is not initialized, cannot create logger for(" + claz + ").");
+ return this;
+ }
+
+ if ( claz == null ) {
+ throw new IllegalArgumentException("New log name must not be null");
+ }
+
+ DuccLogger ret = getLogger(claz, this.getComponent());
+
+ Category l = logger;
+ // List<Appender> appenders= new ArrayList<Appender>();
+ while ( l != null ) {
+ @SuppressWarnings("rawtypes")
+ Enumeration apps = l.getAllAppenders();
+ if ( apps.hasMoreElements() ) {
+ while (apps.hasMoreElements() ) {
+ Appender app = (Appender) apps.nextElement();
+ if ( ret.getAppender(app.getName()) == null ) {
+ ret.addAppender(app);
+ }
+ }
+ }
+ l = l.getParent();
+ }
+ return ret;
+ }
+
+ // PACKAGE protection
+ void removeAllAppenders()
+ {
+ this.logger.removeAllAppenders();
+ }
+
+ // PACKAGE protection
+ void addAppender(Appender app)
+ {
+ this.logger.addAppender(app);
+ }
+
+ Appender getAppender(String name)
+ {
+ return this.logger.getAppender(name);
+ }
+
static public void setUnthreaded()
{
threaded = false;
@@ -98,7 +150,8 @@ public class DuccLogger
if ( component == null ) {
component = DEFAULT_COMPONENT;
}
- Enumeration all_loggers = LogManager.getCurrentLoggers();
+ @SuppressWarnings("rawtypes")
+ Enumeration all_loggers = LogManager.getCurrentLoggers();
while (all_loggers.hasMoreElements() ) {
Logger l = (Logger) all_loggers.nextElement();
String n = l.getName();
@@ -153,30 +206,31 @@ public class DuccLogger
}
Category l = logger;
- List<Appender> appenders= new ArrayList<Appender>();
+ // List<Appender> appenders= new ArrayList<Appender>();
while ( l != null ) {
- Enumeration apps = l.getAllAppenders();
+ @SuppressWarnings("rawtypes")
+ Enumeration apps = l.getAllAppenders();
if ( apps.hasMoreElements() ) {
while (apps.hasMoreElements() ) {
Appender app = (Appender) apps.nextElement();
- appenders.add(app);
+ // appenders.add(app);
if ( l.getName().startsWith("org.apache.uima.ducc") ) {
System.out.println(" ---> Found appender " + app.getName() + " on logger " + l.getName());
for ( Logger ll : nonDuccLoggers ) { // put the appender on the non-Ducc logger
System.out.println(" ---> Add appender " + app.getName() + " to logger " + ll.getName());
- ll.addAppender(app);
+ if ( ll.getAppender(app.getName() ) == null ) {
+ ll.addAppender(app);
+ }
}
} else {
System.out.println(" ---> Skipping non-DUCC appender " + app.getName() + " on logger " + l.getName());
}
}
-
- break;
} else {
System.out.println(" ---> No appenders on logger " + l.getName());
- l = l.getParent();
}
+ l = l.getParent();
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java?rev=1611465&r1=1611464&r2=1611465&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java Thu Jul 17 20:09:11 2014
@@ -36,7 +36,7 @@ public class DuccWorkReservation extends
private static final long serialVersionUID = 1L;
// private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(DuccWorkReservation.class.getName());
- private static final DuccLogger logger = DuccService.getDuccLogger();
+ private static final DuccLogger logger = DuccService.getDuccLogger(DuccWorkReservation.class.getName());
private IDuccReservationMap duccReservationMap = new DuccReservationMap();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/history/HistoryPersistenceManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/history/HistoryPersistenceManager.java?rev=1611465&r1=1611464&r2=1611465&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/history/HistoryPersistenceManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/history/HistoryPersistenceManager.java Thu Jul 17 20:09:11 2014
@@ -47,7 +47,7 @@ public class HistoryPersistenceManager i
}
// private static final DuccLogger logger = DuccLoggerComponents.getTrLogger(HistoryPersistenceManager.class.getName());
- private static final DuccLogger logger = DuccService.getDuccLogger();
+ private static final DuccLogger logger = DuccService.getDuccLogger(HistoryPersistenceManager.class.getName());
private String historyDirectory_jobs = IDuccEnv.DUCC_HISTORY_JOBS_DIR;
private String historyDirectory_reservations = IDuccEnv.DUCC_HISTORY_RESERVATIONS_DIR;