Skip to content

Commit

Permalink
use ExtendedLogger from log4j2 instead of Logger
Browse files Browse the repository at this point in the history
pass Logger class name to logIfEnabled, this fixes the logging of method/line# as Log4j2LogDelegate#log:151

Signed-off-by: alexlehm <alexlehm@gmail.com>
  • Loading branch information
alexlehm committed Sep 21, 2016
1 parent e4eb213 commit cb09cd6
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/main/java/io/vertx/core/logging/Log4j2LogDelegate.java
Expand Up @@ -19,6 +19,7 @@
import io.vertx.core.spi.logging.LogDelegate; import io.vertx.core.spi.logging.LogDelegate;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.message.FormattedMessage; import org.apache.logging.log4j.message.FormattedMessage;
import org.apache.logging.log4j.spi.ExtendedLogger;


/** /**
* A {@link LogDelegate} which delegates to Apache Log4j 2 * A {@link LogDelegate} which delegates to Apache Log4j 2
Expand All @@ -27,10 +28,11 @@
*/ */
public class Log4j2LogDelegate implements LogDelegate { public class Log4j2LogDelegate implements LogDelegate {


final org.apache.logging.log4j.Logger logger; final ExtendedLogger logger;
final static String FQCN = Logger.class.getCanonicalName();


Log4j2LogDelegate(final String name) { Log4j2LogDelegate(final String name) {
logger = org.apache.logging.log4j.LogManager.getLogger(name); logger = (ExtendedLogger) org.apache.logging.log4j.LogManager.getLogger(name);
} }


public boolean isInfoEnabled() { public boolean isInfoEnabled() {
Expand Down Expand Up @@ -148,15 +150,15 @@ private void log(Level level, Object message) {
} }


private void log(Level level, Object message, Throwable t) { private void log(Level level, Object message, Throwable t) {
logger.log(level, message, t); logger.logIfEnabled(FQCN, level, null, message, t);
} }


private void log(Level level, String message, Object... params) { private void log(Level level, String message, Object... params) {
logger.log(level, message, params); logger.logIfEnabled(FQCN, level, null, message, params);
} }


private void log(Level level, String message, Throwable t, Object... params) { private void log(Level level, String message, Throwable t, Object... params) {
logger.log(level, new FormattedMessage(message, params), t); logger.logIfEnabled(FQCN, level, null, new FormattedMessage(message, params), t);
} }


@Override @Override
Expand Down

0 comments on commit cb09cd6

Please sign in to comment.