This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via b6e0c251129fb0eb4da237cbb9a99517599b6f5d (commit) from 0165681d3ca125096a88a32f47ba975503178dc9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=b6e0c251129fb0eb4da237cbb9a... http://github.com/ceki/slf4j/commit/b6e0c251129fb0eb4da237cbb9a99517599b6f5d commit b6e0c251129fb0eb4da237cbb9a99517599b6f5d Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Oct 20 18:58:47 2010 +0200 support for X_TRACE level diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java index 5aaae14..4180c4f 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java @@ -26,13 +26,13 @@ import org.slf4j.spi.LocationAwareLogger; * <code>org.apache.log4j.Category</code> class (as found in log4j 1.2) by * delegation of all calls to a {@link org.slf4j.Logger} instance. * </p> - * + * * <p> * Log4j's <code>trace</code>, <code>debug()</code>, <code>info()</code>, * <code>warn()</code>, <code>error()</code> printing methods are directly * mapped to their SLF4J equivalents. Log4j's <code>fatal()</code> printing * method is mapped to SLF4J's <code>error()</code> method with a FATAL marker. - * + * * @author Sébastien Pennec * @author Ceki Gülcü */ @@ -65,7 +65,7 @@ public class Category { /** * Returns the obvious. - * + * * @return */ public String getName() { @@ -74,10 +74,10 @@ public class Category { /** * Return the level in effect for this category/logger. - * + * * <p> * The result is computed by simulation. - * + * * @return */ public Level getEffectiveLevel() { @@ -99,7 +99,7 @@ public class Category { /** * Returns the assigned {@link Level}, if any, for this Category. This * implementation always returns null. - * + * * @return Level - the assigned Level, can be <code>null</code>. */ final public Level getLevel() { @@ -145,7 +145,7 @@ public class Category { * Determines whether the priority passed as parameter is enabled in the * underlying SLF4J logger. Each log4j priority is mapped directly to its * SLF4J equivalent, except for FATAL which is mapped as ERROR. - * + * * @param p * the priority to check against * @return true if this logger is enabled for the given level, false @@ -171,6 +171,7 @@ public class Category { void differentiatedLog(Marker marker, String fqcn, int level, Object message, Throwable t) { + String m = convertToString(message); if (locationAwareLogger != null) { locationAwareLogger.log(marker, fqcn, level, m, null, t); @@ -299,6 +300,7 @@ public class Category { private int priorityToLevelInt(Priority p) { switch (p.level) { case Level.TRACE_INT: + case Level.X_TRACE_INT: return LocationAwareLogger.TRACE_INT; case Priority.DEBUG_INT: return LocationAwareLogger.DEBUG_INT; diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Level.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Level.java index 36ae571..c8b29fe 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Level.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Level.java @@ -44,6 +44,9 @@ public class Level extends Priority implements Serializable { */ public static final int TRACE_INT = 5000; + // match jboss' xlevel + public static final int X_TRACE_INT = DEBUG_INT - 100; + /** The <code>OFF</code> has the highest possible rank and is intended to turn off logging. */ diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java index 36a2fa6..1ddcb91 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/spi/LoggerRepository.java @@ -49,7 +49,7 @@ public interface LoggerRepository { boolean isDisabled(int level); /** - * Set the repository-wide threshold. All loxx requests below the + * Set the repository-wide threshold. All logging requests below the * threshold are immediately dropped. By default, the threshold is * set to <code>Level.ALL</code> which has the lowest possible rank. */ ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/apache/log4j/Category.java | 16 +++++++++------- .../src/main/java/org/apache/log4j/Level.java | 3 +++ .../org/apache/log4j/spi/LoggerRepository.java | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java