You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/03/16 15:10:58 UTC
[1/4] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to AbstractLogger
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1278-gc-free-logger b6ef29324 -> 7db64d5df
LOG4J2-1278 added methods with unrolled varargs to AbstractLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ec948a03
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ec948a03
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ec948a03
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: ec948a03b220a0fc0d43b862045405326c92dd48
Parents: b6ef293
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:09:04 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:09:04 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/spi/AbstractLogger.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec948a03/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 f21c697..c7d8156 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
@@ -1939,7 +1939,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0)) {
final Message msg = newMessage(message, p0);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1948,7 +1948,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1)) {
final Message msg = newMessage(message, p0, p1);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1956,7 +1956,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2)) {
final Message msg = newMessage(message, p0, p1, p2);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1964,7 +1964,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3)) {
final Message msg = newMessage(message, p0, p1, p2, p3);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1973,7 +1973,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1982,7 +1982,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -1991,7 +1991,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
@Override
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -2001,7 +2001,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -2011,7 +2011,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
@@ -2021,7 +2021,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
public void log(final Level level, final String message, final Object p0, final Object p1, final Object p2, final Object p3,
final Object p4, final Object p5, final Object p6,
final Object p7, final Object p8, final Object p9) {
- if (isEnabled(level, null, message)) {
+ if (isEnabled(level, null, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) {
final Message msg = newMessage(message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
logMessage(FQCN, level, null, msg, msg.getThrowable());
}
[2/4] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to ExtendedLogger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to ExtendedLogger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/48189cc1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/48189cc1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/48189cc1
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 48189cc1d7644dee3b466b615b1c9b67d04a83f1
Parents: ec948a0
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:09:32 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:09:32 2016 +1100
----------------------------------------------------------------------
.../logging/log4j/spi/ExtendedLogger.java | 189 +++++++++++++++++--
1 file changed, 175 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/48189cc1/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
index 2bb2ea8..08b2e7e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java
@@ -31,7 +31,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The Message.
@@ -42,7 +42,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -53,7 +53,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -64,7 +64,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determine if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -74,7 +74,7 @@ public interface ExtendedLogger extends Logger {
/**
* Determines if logging is enabled.
- *
+ *
* @param level The logging Level to check.
* @param marker A Marker or null.
* @param message The message.
@@ -84,8 +84,169 @@ public interface ExtendedLogger extends Logger {
boolean isEnabled(Level level, Marker marker, String message, Object... params);
/**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8);
+
+ /**
+ * Determines if logging is enabled.
+ *
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return True if logging is enabled, false otherwise.
+ */
+ boolean isEnabled(Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8, Object p9);
+
+ /**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -97,7 +258,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -109,7 +270,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -121,7 +282,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -132,7 +293,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -145,7 +306,7 @@ public interface ExtendedLogger extends Logger {
/**
* Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -157,7 +318,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message which is only to be constructed if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -171,7 +332,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message whose parameters are only to be constructed if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
@@ -183,7 +344,7 @@ public interface ExtendedLogger extends Logger {
/**
* Logs a message which is only to be constructed if the specified level is active.
- *
+ *
* @param fqcn The fully qualified class name of the logger entry point, used to determine the caller class and
* method when location information needs to be logged.
* @param level The logging Level to check.
[3/4] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to log4j-core Logger
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to log4j-core Logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ae98c6fe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ae98c6fe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ae98c6fe
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: ae98c6fea8b1fdcefcb454785aae99125292b58e
Parents: 48189cc
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:10:16 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:10:16 2016 +1100
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/Logger.java | 223 +++++++++++++++++--
1 file changed, 210 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ae98c6fe/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
index 83996c4..4f0c495 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
@@ -62,7 +62,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* The constructor.
- *
+ *
* @param context The LoggerContext this Logger is associated with.
* @param messageFactory The message factory.
* @param name The name of the Logger.
@@ -99,7 +99,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* Returns the LoggerContext this Logger is associated with.
- *
+ *
* @return the LoggerContext.
*/
public LoggerContext getContext() {
@@ -111,7 +111,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
* <p>
* If the new level is null, this logger inherits the level from its parent.
* </p>
- *
+ *
* @param level The Level to use on this Logger, may be null.
*/
public synchronized void setLevel(final Level level) {
@@ -130,7 +130,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.logging.log4j.util.Supplier#get()
*/
@Override
@@ -162,6 +162,74 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
}
@Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0) {
+ return privateConfig.filter(level, marker, message, p0);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1) {
+ return privateConfig.filter(level, marker, message, p0, p1);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ }
+
+ @Override
+ public boolean isEnabled(final Level level, final Marker marker, final String message, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return privateConfig.filter(level, marker, message, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9);
+ }
+
+ @Override
public boolean isEnabled(final Level level, final Marker marker, final Object message, final Throwable t) {
return privateConfig.filter(level, marker, message, t);
}
@@ -173,7 +241,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @param appender The Appender to add to the Logger.
*/
public void addAppender(final Appender appender) {
@@ -182,7 +250,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @param appender The Appender to remove from the Logger.
*/
public void removeAppender(final Appender appender) {
@@ -191,7 +259,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @return A Map containing the Appender's name as the key and the Appender as the value.
*/
public Map<String, Appender> getAppenders() {
@@ -200,7 +268,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @return An Iterator over all the Filters associated with the Logger.
*/
// FIXME: this really ought to be an Iterable instead of an Iterator
@@ -229,7 +297,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @return The number of Filters associated with the Logger.
*/
public int filterCount() {
@@ -244,7 +312,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is used primarily for unit testing.
- *
+ *
* @param filter The Filter to add.
*/
public void addFilter(final Filter filter) {
@@ -254,7 +322,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is present only to support the Log4j 1.2 compatibility
* bridge.
- *
+ *
* @return true if the associated LoggerConfig is additive, false otherwise.
*/
public boolean isAdditive() {
@@ -264,7 +332,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* This method is not exposed through the public API and is present only to support the Log4j 1.2 compatibility
* bridge.
- *
+ *
* @param additive Boolean value to indicate whether the Logger is additive or not.
*/
public void setAdditive(final boolean additive) {
@@ -367,6 +435,135 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
return level != null && intLevel >= level.intLevel();
}
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
+ boolean filter(final Level level, final Marker marker, final String msg, final Object p0,
+ final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ final Filter filter = config.getFilter();
+ if (filter != null) {
+ final Filter.Result r = filter.filter(logger, level, marker, msg, p0, p1, p2, p3, p4, p5, p6, p7, p8,
+ p9);
+ if (r != Filter.Result.NEUTRAL) {
+ return r == Filter.Result.ACCEPT;
+ }
+ }
+ return level != null && intLevel >= level.intLevel();
+ }
+
boolean filter(final Level level, final Marker marker, final Object msg, final Throwable t) {
final Filter filter = config.getFilter();
if (filter != null) {
@@ -431,7 +628,7 @@ public class Logger extends AbstractLogger implements Supplier<LoggerConfig> {
/**
* Returns a String representation of this instance in the form {@code "name:level[ in context_name]"}.
- *
+ *
* @return A String describing this Logger instance.
*/
@Override
[4/4] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to Filter and AbstractFilter
Posted by rp...@apache.org.
LOG4J2-1278 added methods with unrolled varargs to Filter and AbstractFilter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7db64d5d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7db64d5d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7db64d5d
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 7db64d5dfa60bb473889a445f6b7290993cac9ba
Parents: ae98c6f
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 17 01:10:45 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 17 01:10:45 2016 +1100
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/Filter.java | 171 ++++++++++++++++
.../log4j/core/filter/AbstractFilter.java | 204 +++++++++++++++++++
2 files changed, 375 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7db64d5d/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
index af1dd68..0286498 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java
@@ -103,6 +103,177 @@ public interface Filter extends LifeCycle {
/**
* Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8);
+
+ /**
+ * Filter an event.
+ *
+ * @param logger The Logger.
+ * @param level the event logging level.
+ * @param marker The Marker for the event or null.
+ * @param message The message.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return the Result.
+ */
+ Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3,
+ Object p4, Object p5, Object p6, Object p7, Object p8, Object p9);
+
+ /**
+ * Filter an event.
* @param logger The Logger.
* @param level The event logging Level.
* @param marker The Marker for the event or null.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7db64d5d/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
index 52ee030..9473d70 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
@@ -136,6 +136,210 @@ public abstract class AbstractFilter extends AbstractLifeCycle implements Filter
}
/**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8) {
+ return Result.NEUTRAL;
+ }
+
+ /**
+ * Appender Filter method. The default returns NEUTRAL.
+ * @param logger the Logger.
+ * @param level The logging Level.
+ * @param marker The Marker, if any.
+ * @param msg The message, if present.
+ * @param p0 the message parameters
+ * @param p1 the message parameters
+ * @param p2 the message parameters
+ * @param p3 the message parameters
+ * @param p4 the message parameters
+ * @param p5 the message parameters
+ * @param p6 the message parameters
+ * @param p7 the message parameters
+ * @param p8 the message parameters
+ * @param p9 the message parameters
+ * @return The Result of filtering.
+ */
+ @Override
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object p0, final Object p1, final Object p2, final Object p3,
+ final Object p4, final Object p5, final Object p6,
+ final Object p7, final Object p8, final Object p9) {
+ return Result.NEUTRAL;
+ }
+
+ /**
* Returns the Result to be returned when a match occurs.
* @return the onMatch Result.
*/