Clean up flow logging implementation. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/880e0b6a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/880e0b6a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/880e0b6a
Branch: refs/heads/LOG4J2-1278-gc-free-logger Commit: 880e0b6aeb533658ff1ea1ae0a2d5465fbcb7fad Parents: 74ee5ac Author: ggregory <[email protected]> Authored: Sun Feb 21 22:50:59 2016 -0800 Committer: ggregory <[email protected]> Committed: Sun Feb 21 22:50:59 2016 -0800 ---------------------------------------------------------------------- .../logging/log4j/spi/AbstractLogger.java | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/880e0b6a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index ceac52f..f0d1466 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@ -356,6 +356,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { * @param format The format String for the parameters. * @param paramSuppliers The parameters to the method. */ + @Deprecated protected EntryMessage enter(final String fqcn, final String format, final MessageSupplier... paramSuppliers) { EntryMessage entryMsg = null; if (isEnabled(Level.TRACE, ENTRY_MARKER, (Object) null, null)) { @@ -385,6 +386,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { * @param fqcn The fully qualified class name of the <b>caller</b>. * @param msgSupplier The Supplier of the Message. */ + @Deprecated protected EntryMessage enter(final String fqcn, final MessageSupplier msgSupplier) { EntryMessage message = null; if (isEnabled(Level.TRACE, ENTRY_MARKER, (Object) null, null)) { @@ -394,6 +396,24 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { return message; } + /** + * Logs entry to a method with location information. + * + * @param fqcn + * The fully qualified class name of the <b>caller</b>. + * @param message + * the Message. + * @since 2.6 + */ + protected EntryMessage enter(final String fqcn, final Message message) { + EntryMessage flowMessage = null; + if (isEnabled(Level.TRACE, ENTRY_MARKER, (Object) null, null)) { + logMessage(fqcn, Level.TRACE, ENTRY_MARKER, flowMessage = flowMessageFactory.newEntryMessage(message), + null); + } + return flowMessage; + } + @Override public void entry() { entry(FQCN, (Object[]) null); @@ -1368,12 +1388,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { @Override public EntryMessage traceEntry(final Message message) { - return enter(FQCN, new MessageSupplier() { - @Override - public Message get() { - return message; - } - }); + return enter(FQCN, message); } @Override @@ -1394,24 +1409,14 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { @Override public void traceExit(final EntryMessage message) { if (isEnabled(Level.TRACE, EXIT_MARKER, message, null)) { - logMessage(FQCN, Level.TRACE, EXIT_MARKER, new MessageSupplier() { - @Override - public Message get() { - return flowMessageFactory.newExitMessage(message); - }; - }, null); + logMessage(FQCN, Level.TRACE, EXIT_MARKER, flowMessageFactory.newExitMessage(message), null); } } @Override public <R> R traceExit(final EntryMessage message, final R result) { if (isEnabled(Level.TRACE, EXIT_MARKER, message, null)) { - logMessage(FQCN, Level.TRACE, EXIT_MARKER, new MessageSupplier() { - @Override - public Message get() { - return flowMessageFactory.newExitMessage(result, message); - }; - }, null); + logMessage(FQCN, Level.TRACE, EXIT_MARKER, flowMessageFactory.newExitMessage(result, message), null); } return result; } @@ -1419,12 +1424,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { @Override public <R> R traceExit(final Message message, final R result) { if (isEnabled(Level.TRACE, EXIT_MARKER, message, null)) { - logMessage(FQCN, Level.TRACE, EXIT_MARKER, new MessageSupplier() { - @Override - public Message get() { - return flowMessageFactory.newExitMessage(result, message); - }; - }, null); + logMessage(FQCN, Level.TRACE, EXIT_MARKER, flowMessageFactory.newExitMessage(result, message), null); } return result; }
