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/31 09:57:49 UTC
[05/50] logging-log4j2 git commit: LOG4J2-1278 added methods with
unrolled varargs to log4j-core Logger
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/master
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