Repository: logging-log4j2 Updated Branches: refs/heads/release-2.x 7308ae77a -> 738081015
[LOG4J2-2491] Allow all Appenders to optionally carry a Property array. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/73808101 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/73808101 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/73808101 Branch: refs/heads/release-2.x Commit: 7380810159278ed5d833fd62a548070a734d3d79 Parents: 7308ae7 Author: Gary Gregory <[email protected]> Authored: Thu Nov 1 18:08:52 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Thu Nov 1 18:08:52 2018 -0600 ---------------------------------------------------------------------- .../logging/log4j/core/appender/AsyncAppender.java | 16 +++++----------- .../logging/log4j/flume/appender/FlumeAppender.java | 4 ++-- 2 files changed, 7 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/73808101/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java index f7c9694..55dc99a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java @@ -49,6 +49,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory; import org.apache.logging.log4j.core.config.plugins.PluginConfiguration; import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required; +import org.apache.logging.log4j.core.filter.AbstractFilterable; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.util.Log4jThread; import org.apache.logging.log4j.spi.AbstractLogger; @@ -280,7 +281,8 @@ public final class AsyncAppender extends AbstractAppender { return new Builder(); } - public static class Builder implements org.apache.logging.log4j.core.util.Builder<AsyncAppender> { + public static class Builder<B extends Builder<B>> extends AbstractFilterable.Builder<B> + implements org.apache.logging.log4j.core.util.Builder<AsyncAppender> { @PluginElement("AppenderRef") @Required(message = "No appender references provided to AsyncAppender") @@ -306,9 +308,6 @@ public final class AsyncAppender extends AbstractAppender { @PluginBuilderAttribute private boolean includeLocation = false; - @PluginElement("Filter") - private Filter filter; - @PluginConfiguration private Configuration configuration; @@ -353,11 +352,6 @@ public final class AsyncAppender extends AbstractAppender { return this; } - public Builder setFilter(final Filter filter) { - this.filter = filter; - return this; - } - public Builder setConfiguration(final Configuration configuration) { this.configuration = configuration; return this; @@ -375,8 +369,8 @@ public final class AsyncAppender extends AbstractAppender { @Override public AsyncAppender build() { - return new AsyncAppender(name, filter, appenderRefs, errorRef, bufferSize, blocking, ignoreExceptions, - shutdownTimeout, configuration, includeLocation, blockingQueueFactory, null); + return new AsyncAppender(name, getFilter(), appenderRefs, errorRef, bufferSize, blocking, ignoreExceptions, + shutdownTimeout, configuration, includeLocation, blockingQueueFactory, getPropertyArray()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/73808101/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java index 79afa21..2e29362 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java @@ -75,7 +75,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF private FlumeAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout, final boolean ignoreExceptions, final String includes, final String excludes, final String required, final String mdcPrefix, final String eventPrefix, final boolean compress, final FlumeEventFactory factory, - final AbstractFlumeManager manager, final Property[] properties) { + final Property[] properties, final AbstractFlumeManager manager) { super(name, filter, layout, ignoreExceptions, properties); this.manager = manager; this.mdcIncludes = includes; @@ -264,7 +264,7 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF } return new FlumeAppender(name, filter, layout, ignoreExceptions, includes, - excludes, required, mdcPrefix, eventPrefix, compress, factory, manager, null); + excludes, required, mdcPrefix, eventPrefix, compress, factory, Property.EMPTY_ARRAY, manager); } private static Agent[] getAgents(Agent[] agents, final String hosts) {
