Skip to content

Commit

Permalink
SLF4j-466: put the throwable at the right place of the SubstituteLogg…
Browse files Browse the repository at this point in the history 
…ingEvent, introduced two more recordEvent methods for the two object argument log statements
  • Loading branch information
@delgurth
delgurth committed Aug 12, 2019
1 parent a09d788 commit 9df5d4f
Showing 1 changed file with 39 additions and 14 deletions.
53 changes: 39 additions & 14 deletions slf4j-api/src/main/java/org/slf4j/event/EventRecodingLogger.java
View file
Expand Up @@ -5,6 +5,7 @@
import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.helpers.SubstituteLogger;
import org.slf4j.helpers.Util;

public class EventRecodingLogger implements Logger {

Expand All @@ -22,6 +23,18 @@ public String getName() {
return name;
}

private void recordEvent(Level level, String msg, Object arg1, Object arg2) {
recordEvent(level, null, msg, arg1, arg2);
}

private void recordEvent(Level level, Marker marker, String msg, Object arg1, Object arg2) {
if (arg2 instanceof Throwable) {
recordEvent(level, marker, msg, new Object[] { arg1 }, (Throwable) arg2);
} else {
recordEvent(level, marker, msg, new Object[] { arg1, arg2 }, null);
}
}

private void recordEvent(Level level, String msg, Object[] args, Throwable throwable) {
recordEvent(level, null, msg, args, throwable);
}
Expand All @@ -35,9 +48,23 @@ private void recordEvent(Level level, Marker marker, String msg, Object[] args,
loggingEvent.setLoggerName(name);
loggingEvent.addMarker(marker);
loggingEvent.setMessage(msg);
loggingEvent.setArgumentArray(args);
loggingEvent.setThrowable(throwable);
loggingEvent.setThreadName(Thread.currentThread().getName());

// 1 and 2 args are covered by other methods
if(throwable == null && args != null && args.length > 2) {
Throwable throwableCandidate = Util.getThrowableCandidate(args);
if(throwableCandidate != null) {
loggingEvent.setArgumentArray(Util.trimmedCopy(args));
loggingEvent.setThrowable(throwableCandidate);
} else {
loggingEvent.setArgumentArray(args);
loggingEvent.setThrowable(null);
}
} else {
loggingEvent.setArgumentArray(args);
loggingEvent.setThrowable(throwable);
}

eventQueue.add(loggingEvent);
}

Expand All @@ -54,7 +81,7 @@ public void trace(String format, Object arg) {
}

public void trace(String format, Object arg1, Object arg2) {
recordEvent(Level.TRACE, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.TRACE, format, arg1, arg2);
}

public void trace(String format, Object... arguments) {
Expand All @@ -79,7 +106,7 @@ public void trace(Marker marker, String format, Object arg) {
}

public void trace(Marker marker, String format, Object arg1, Object arg2) {
recordEvent(Level.TRACE, marker, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.TRACE, marker, format, arg1, arg2);
}

public void trace(Marker marker, String format, Object... argArray) {
Expand All @@ -105,8 +132,7 @@ public void debug(String format, Object arg) {
}

public void debug(String format, Object arg1, Object arg2) {
recordEvent(Level.DEBUG, format, new Object[] { arg1, arg2 }, null);

recordEvent(Level.DEBUG, format, arg1, arg2);
}

public void debug(String format, Object... arguments) {
Expand All @@ -130,7 +156,7 @@ public void debug(Marker marker, String format, Object arg) {
}

public void debug(Marker marker, String format, Object arg1, Object arg2) {
recordEvent(Level.DEBUG, marker, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.DEBUG, marker, format, arg1, arg2);
}

public void debug(Marker marker, String format, Object... arguments) {
Expand All @@ -154,7 +180,7 @@ public void info(String format, Object arg) {
}

public void info(String format, Object arg1, Object arg2) {
recordEvent(Level.INFO, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.INFO, format, arg1, arg2);
}

public void info(String format, Object... arguments) {
Expand All @@ -178,7 +204,7 @@ public void info(Marker marker, String format, Object arg) {
}

public void info(Marker marker, String format, Object arg1, Object arg2) {
recordEvent(Level.INFO, marker, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.INFO, marker, format, arg1, arg2);
}

public void info(Marker marker, String format, Object... arguments) {
Expand All @@ -204,7 +230,7 @@ public void warn(String format, Object arg) {
}

public void warn(String format, Object arg1, Object arg2) {
recordEvent(Level.WARN, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.WARN, format, arg1, arg2);
}

public void warn(String format, Object... arguments) {
Expand All @@ -228,8 +254,7 @@ public void warn(Marker marker, String format, Object arg) {
}

public void warn(Marker marker, String format, Object arg1, Object arg2) {
recordEvent(Level.WARN, marker, format, new Object[] { arg1, arg2 }, null);

recordEvent(Level.WARN, marker, format, arg1, arg2);
}

public void warn(Marker marker, String format, Object... arguments) {
Expand All @@ -254,7 +279,7 @@ public void error(String format, Object arg) {
}

public void error(String format, Object arg1, Object arg2) {
recordEvent(Level.ERROR, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.ERROR, format, arg1, arg2);

}

Expand Down Expand Up @@ -282,7 +307,7 @@ public void error(Marker marker, String format, Object arg) {
}

public void error(Marker marker, String format, Object arg1, Object arg2) {
recordEvent(Level.ERROR, marker, format, new Object[] { arg1, arg2 }, null);
recordEvent(Level.ERROR, marker, format, arg1, arg2);
}

public void error(Marker marker, String format, Object... arguments) {
Expand Down

0 comments on commit 9df5d4f

Please sign in to comment.