You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/03/02 15:07:48 UTC
svn commit: r1785152 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util:
./ impl/
Author: schor
Date: Thu Mar 2 15:07:48 2017
New Revision: 1785152
URL: http://svn.apache.org/viewvc?rev=1785152&view=rev
Log:
[UIMA-5343] fix logger levels
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Level.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Level.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Level.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Level.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Level.java Thu Mar 2 15:07:48 2017
@@ -56,7 +56,14 @@ public class Level {
/** level value for level "ALL" */
public final static int ALL_INT = Integer.MIN_VALUE;
-
+ /** level value for level "ERROR" */
+ public final static int ERROR_INT = SEVERE_INT;
+ /** level value for level "WARN" */
+ public final static int WARN_INT = WARNING_INT;
+ /** level value for level "DEBUG" */
+ public final static int DEBUG_INT = FINE_INT;
+ /** level value for level "TRACE" */
+ public final static int TRACE_INT = FINER_INT;
/** message level "OFF" */
final static public Level OFF = new Level(OFF_INT, "OFF");
@@ -77,14 +84,14 @@ public class Level {
/** message level "FINE" */
final static public Level FINE = new Level(FINE_INT, "FINE");
- final static public Level TRACE = FINE;
+ final static public Level DEBUG = FINE;
/** message level "FINER" */
final static public Level FINER = new Level(FINER_INT, "FINER");
+ final static public Level TRACE = FINER;
/** message level "FINEST" */
final static public Level FINEST = new Level(FINEST_INT, "FINEST");
- final static public Level DEBUG = FINEST;
/** message level "ALL" */
final static public Level ALL = new Level(ALL_INT, "ALL");
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Logger.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Logger.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/Logger.java Thu Mar 2 15:07:48 2017
@@ -22,7 +22,6 @@ package org.apache.uima.util;
import java.io.OutputStream;
import java.io.PrintStream;
-import org.apache.uima.internal.util.Misc;
import org.apache.uima.resource.ResourceManager;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
@@ -54,10 +53,7 @@ public interface Logger extends org.slf4
// standard markers
static final Marker UIMA_MARKER_CONFIG = MarkerFactory.getMarker("org.apache.uima.config");
- static final Marker UIMA_MARKER_FINE = MarkerFactory.getMarker("org.apache.uima.fine");
- static final Marker UIMA_MARKER_FINER = MarkerFactory.getMarker("org.apache.uima.finer");
- // next not used
-// static final Marker UIMA_MARKER_FINEST = MarkerFactory.getMarker("org.apache.uima.finest");
+ static final Marker UIMA_MARKER_FINEST = MarkerFactory.getMarker("org.apache.uima.finest");
/**
* Logs a message.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java Thu Mar 2 15:07:48 2017
@@ -160,6 +160,8 @@ public class JSR47Logger_impl extends Lo
/**
* JSR-47 level mapping to UIMA level mapping.
*
+ * Maps via marker values for UIMA_MARKER_CONFIG and UIMA_MARKER_FINEST
+ *
* SEVERE (highest value) -%gt; SEVERE<br>
* WARNING -%gt; WARNING<br>
* INFO -%gt; INFO <br>
@@ -188,19 +190,21 @@ public class JSR47Logger_impl extends Lo
case org.apache.uima.util.Level.WARNING_INT:
return java.util.logging.Level.WARNING;
case org.apache.uima.util.Level.INFO_INT:
- return (m == UIMA_MARKER_CONFIG)
+ return (m == UIMA_MARKER_CONFIG)
? java.util.logging.Level.CONFIG
: java.util.logging.Level.INFO;
case org.apache.uima.util.Level.CONFIG_INT:
return java.util.logging.Level.CONFIG;
case org.apache.uima.util.Level.FINE_INT:
- return (m == UIMA_MARKER_FINER)
- ? java.util.logging.Level.FINER
- : java.util.logging.Level.FINE;
+ return java.util.logging.Level.FINE;
case org.apache.uima.util.Level.FINER_INT:
- return java.util.logging.Level.FINER;
+ // could be DEBUG with marker FINEST, DEBUG_INT == FINER_INT
+ return (m == UIMA_MARKER_FINEST)
+ ? java.util.logging.Level.FINEST
+ : java.util.logging.Level.FINER;
case org.apache.uima.util.Level.FINEST_INT:
return java.util.logging.Level.FINEST;
+
default: // for all other cases return Level.ALL
return java.util.logging.Level.ALL;
}
@@ -299,7 +303,7 @@ public class JSR47Logger_impl extends Lo
@Override
public boolean isDebugEnabled() {
- return logger.isLoggable(java.util.logging.Level.FINEST);
+ return logger.isLoggable(java.util.logging.Level.FINE);
}
@Override
@@ -330,8 +334,8 @@ public class JSR47Logger_impl extends Lo
@Override
public boolean isTraceEnabled() {
- return logger.isLoggable(java.util.logging.Level.FINE) ||
- logger.isLoggable(java.util.logging.Level.FINER);
+ return logger.isLoggable(java.util.logging.Level.FINER) ||
+ logger.isLoggable(java.util.logging.Level.FINEST);
}
@Override
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java Thu Mar 2 15:07:48 2017
@@ -45,8 +45,7 @@ public class Log4jLogger_impl extends Lo
* These are log4j class versions of the slf4j markers.
*/
final static private org.apache.logging.log4j.Marker LOG4J_CONFIG = m(UIMA_MARKER_CONFIG);
- final static private org.apache.logging.log4j.Marker LOG4J_FINE = m(UIMA_MARKER_FINE);
- final static private org.apache.logging.log4j.Marker LOG4J_FINER = m(UIMA_MARKER_FINER);
+ final static private org.apache.logging.log4j.Marker LOG4J_FINEST = m(UIMA_MARKER_FINEST);
/**
* Filters for use in setLevel calls, for levels that need marker filtering.
@@ -125,12 +124,9 @@ public class Log4jLogger_impl extends Lo
final static private org.apache.logging.log4j.core.filter.AbstractFilter FILTER_CONFIG =
makeFilter(org.apache.logging.log4j.Level.INFO, LOG4J_CONFIG);
- final static private org.apache.logging.log4j.core.filter.AbstractFilter FILTER_FINE =
- makeFilter(org.apache.logging.log4j.Level.TRACE, LOG4J_FINE);
-
- final static private org.apache.logging.log4j.core.filter.AbstractFilter FILTER_FINER =
- makeFilter(org.apache.logging.log4j.Level.TRACE, LOG4J_FINER);
-
+ final static private org.apache.logging.log4j.core.filter.AbstractFilter FILTER_FINEST =
+ makeFilter(org.apache.logging.log4j.Level.TRACE, LOG4J_FINEST);
+
/**
* logger object from the underlying Log4j logging framework
* The ExtendedLoggerWrapper includes the ability to specify the wrapper class
@@ -200,9 +196,9 @@ public class Log4jLogger_impl extends Lo
* WARNING -> WARNING <br>
* INFO -> INFO <br>
* CONFIG -> INFO <br>
- * FINE -> TRACE <br>
+ * FINE -> DEBUG <br>
* FINER -> TRACE <br>
- * FINEST (lowest value) -> DEBUG <br>
+ * FINEST (lowest value) -> TRACE <br>
* OFF -> OFF <br>
* ALL -> ALL <br>
*
@@ -222,11 +218,11 @@ public class Log4jLogger_impl extends Lo
case org.apache.uima.util.Level.CONFIG_INT:
return org.apache.logging.log4j.Level.INFO;
case org.apache.uima.util.Level.FINE_INT:
- return org.apache.logging.log4j.Level.TRACE;
+ return org.apache.logging.log4j.Level.DEBUG;
case org.apache.uima.util.Level.FINER_INT:
return org.apache.logging.log4j.Level.TRACE;
case org.apache.uima.util.Level.FINEST_INT:
- return org.apache.logging.log4j.Level.DEBUG;
+ return org.apache.logging.log4j.Level.TRACE;
default: // for all other cases return Level.ALL
return org.apache.logging.log4j.Level.ALL;
}
@@ -249,17 +245,12 @@ public class Log4jLogger_impl extends Lo
return r == Result.ACCEPT ||
(r == Result.NEUTRAL && coreLogger.isEnabled(org.apache.logging.log4j.Level.TRACE));
}
- if (level == Level.FINE) {
- Result r = filterTest(org.apache.logging.log4j.Level.TRACE, LOG4J_FINE);
+ if (level == Level.FINEST) {
+ Result r = filterTest(org.apache.logging.log4j.Level.TRACE, LOG4J_FINEST);
return r == Result.ACCEPT ||
- (r == Result.NEUTRAL && coreLogger.isEnabled(org.apache.logging.log4j.Level.DEBUG));
+ (r == Result.NEUTRAL && coreLogger.isEnabled(org.apache.logging.log4j.Level.TRACE));
}
- if (level == Level.FINER) {
- Result r = filterTest(org.apache.logging.log4j.Level.TRACE, LOG4J_FINER);
- return r == Result.ACCEPT ||
- (r == Result.NEUTRAL && coreLogger.isEnabled(org.apache.logging.log4j.Level.DEBUG));
- }
return coreLogger.isEnabled(getLog4jLevel(level));
}
@@ -298,18 +289,12 @@ public class Log4jLogger_impl extends Lo
coreLogger.get().removeFilter(FILTER_CONFIG);
}
- if (level == Level.FINE) {
- coreLogger.get().addFilter(FILTER_FINE);
+ if (level == Level.FINEST) {
+ coreLogger.get().addFilter(FILTER_FINEST);
} else {
- coreLogger.get().removeFilter(FILTER_FINE);
+ coreLogger.get().removeFilter(FILTER_FINEST);
}
-
- if (level == Level.FINER) {
- coreLogger.get().addFilter(FILTER_FINER);
- } else {
- coreLogger.get().removeFilter(FILTER_FINER);
- }
-
+
coreLogger.get().setLevel(getLog4jLevel(level));
coreLogger.getContext().updateLoggers();
}
@@ -328,8 +313,6 @@ public class Log4jLogger_impl extends Lo
}
// ----------------------
-
- // ----------------------
@Override
public boolean isDebugEnabled() {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java Thu Mar 2 15:07:48 2017
@@ -22,8 +22,8 @@ package org.apache.uima.util.impl;
import java.io.OutputStream;
import java.io.PrintStream;
import java.text.MessageFormat;
+import java.util.function.Supplier;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.uima.internal.util.I18nUtil;
import org.apache.uima.internal.util.Misc;
import org.apache.uima.resource.ResourceManager;
@@ -141,9 +141,7 @@ public abstract class Logger_common_impl
public static Marker getMarkerForLevel(Level level) {
switch(level.toInteger()) {
case Level.CONFIG_INT: return UIMA_MARKER_CONFIG;
- case Level.FINE_INT: return UIMA_MARKER_FINE;
- case Level.FINER_INT: return UIMA_MARKER_FINER;
-// case Level.FINEST_INT: return UIMA_MARKER_FINEST;
+ case Level.FINEST_INT: return UIMA_MARKER_FINEST;
default: return null;
}
}
@@ -806,28 +804,28 @@ void info(Marker marker, Supplier<String
@Override
public void trace(String arg0) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, arg0, null, null);
+ log(null, fqcnCmn, Level.TRACE, arg0, null, null);
}
}
@Override
public void trace(String arg0, Object arg1) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, arg0, new Object[] {arg1}, null);
+ log(null, fqcnCmn, Level.TRACE, arg0, new Object[] {arg1}, null);
}
}
@Override
public void trace(String arg0, Object... arg1) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, arg0, arg1, null);
+ log(null, fqcnCmn, Level.TRACE, arg0, arg1, null);
}
}
@Override
public void trace(String arg0, Throwable arg1) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, arg0, null, arg1);
+ log(null, fqcnCmn, Level.TRACE, arg0, null, arg1);
}
}
@@ -841,7 +839,7 @@ public void trace(Marker arg0, String ar
@Override
public void trace(String arg0, Object arg1, Object arg2) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, arg0, new Object[] {arg1}, null);
+ log(null, fqcnCmn, Level.TRACE, arg0, new Object[] {arg1}, null);
}
}
@@ -880,7 +878,7 @@ public void trace(Marker arg0, String ar
*/
void trace(Supplier<String> msgSupplier) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
+ log(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
}
}
@@ -890,7 +888,7 @@ void trace(Supplier<String> msgSupplier)
*/
void trace(Supplier<String> msgSupplier, Throwable throwable) {
if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
- log(UIMA_MARKER_FINE, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
+ log(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java Thu Mar 2 15:07:48 2017
@@ -175,7 +175,7 @@ public class Logger_impl extends Logger_
@Override
public boolean isDebugEnabled() {
- return isLoggable(Level.FINEST);
+ return isLoggable(Level.FINE);
}
@Override
@@ -206,8 +206,8 @@ public class Logger_impl extends Logger_
@Override
public boolean isTraceEnabled() {
- return isLoggable(Level.FINE) ||
- isLoggable(Level.FINER);
+ return isLoggable(Level.FINER) ||
+ isLoggable(Level.FINEST);
}
@Override
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java?rev=1785152&r1=1785151&r2=1785152&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java Thu Mar 2 15:07:48 2017
@@ -133,9 +133,9 @@ public class Slf4jLogger_impl extends Lo
case Level.WARNING_INT: return LocationAwareLogger.WARN_INT;
case Level.INFO_INT: return LocationAwareLogger.INFO_INT;
case Level.CONFIG_INT: return LocationAwareLogger.INFO_INT;
- case Level.FINE_INT: return LocationAwareLogger.TRACE_INT;
+ case Level.FINE_INT: return LocationAwareLogger.DEBUG_INT;
case Level.FINER_INT: return LocationAwareLogger.TRACE_INT;
- case Level.FINEST_INT: return LocationAwareLogger.DEBUG_INT;
+ case Level.FINEST_INT: return LocationAwareLogger.TRACE_INT;
}
Misc.internalError();
return LocationAwareLogger.ERROR_INT; //ignored, just here for compile error avoidance
@@ -157,13 +157,13 @@ public class Slf4jLogger_impl extends Lo
case org.apache.uima.util.Level.INFO_INT:
return logger.isInfoEnabled();
case org.apache.uima.util.Level.CONFIG_INT:
- return logger.isInfoEnabled();
+ return logger.isInfoEnabled(UIMA_MARKER_CONFIG);
case org.apache.uima.util.Level.FINE_INT:
- return logger.isTraceEnabled();
+ return logger.isDebugEnabled();
case org.apache.uima.util.Level.FINER_INT:
return logger.isTraceEnabled();
case org.apache.uima.util.Level.FINEST_INT:
- return logger.isTraceEnabled();
+ return logger.isTraceEnabled(UIMA_MARKER_FINEST);
default: // for Level.ALL return false, that's what jul logger does
return false;
}
@@ -182,7 +182,7 @@ public class Slf4jLogger_impl extends Lo
case org.apache.uima.util.Level.CONFIG_INT:
return logger.isInfoEnabled(marker);
case org.apache.uima.util.Level.FINE_INT:
- return logger.isTraceEnabled(marker);
+ return logger.isDebugEnabled(marker);
case org.apache.uima.util.Level.FINER_INT:
return logger.isTraceEnabled(marker);
case org.apache.uima.util.Level.FINEST_INT:
@@ -202,25 +202,35 @@ public class Slf4jLogger_impl extends Lo
}
public void log(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
+ m = (m == null)
+ ? getMarkerForLevel(level)
+ : m;
+
if (isLocationCapable) { // slf4j simple logger is not
((org.slf4j.spi.LocationAwareLogger)logger).log(m, aFqcn, getSlf4jLevel(level), message, args, thrown);
} else {
- switch(getSlf4jLevel(level)) {
- case LocationAwareLogger.ERROR_INT:
+ switch(level.toInteger()) {
+ case Level.SEVERE_INT:
logger.error(m, MessageFormat.format(message, args), thrown);
break;
- case LocationAwareLogger.WARN_INT:
+ case Level.WARNING_INT:
logger.warn(m, MessageFormat.format(message, args), thrown);
break;
- case LocationAwareLogger.INFO_INT:
+ case Level.INFO_INT:
logger.info(m, MessageFormat.format(message, args), thrown);
break;
- case LocationAwareLogger.TRACE_INT:
- logger.trace(m, MessageFormat.format(message, args), thrown);
+ case Level.CONFIG_INT:
+ logger.info(m, MessageFormat.format(message, args), thrown);
break;
- case LocationAwareLogger.DEBUG_INT:
+ case Level.FINE_INT:
logger.debug(m, MessageFormat.format(message, args), thrown);
break;
+ case Level.FINER_INT:
+ logger.trace(m, MessageFormat.format(message, args), thrown);
+ break;
+ case Level.FINEST_INT:
+ logger.trace(m, MessageFormat.format(message, args), thrown);
+ break;
default: Misc.internalError();
}
}