You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/10/04 00:47:04 UTC
git commit: [LOG4J2-867] FlumeAppender: maxDelay not in seconds,
but milliseconds. Fix docs. Renamed maxDelay to maxDelayMillis. Made
maxDelay an alias for maxDelayMillis. Running "mvn clean test" OK.
Repository: logging-log4j2
Updated Branches:
refs/heads/master e8f0fa848 -> a73ae666b
[LOG4J2-867] FlumeAppender: maxDelay not in seconds, but milliseconds.
Fix docs. Renamed maxDelay to maxDelayMillis. Made maxDelay an alias for
maxDelayMillis. Running "mvn clean test" OK.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a73ae666
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a73ae666
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a73ae666
Branch: refs/heads/master
Commit: a73ae666b4afcd87018ea1c34380f5d76c206a69
Parents: e8f0fa8
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Oct 3 18:47:00 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Oct 3 18:47:00 2014 -0400
----------------------------------------------------------------------
.../org/apache/logging/log4j/flume/appender/FlumeAppender.java | 4 +++-
src/site/xdoc/manual/appenders.xml | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a73ae666/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 55c34e7..91ea833 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
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAliases;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -169,7 +170,8 @@ public final class FlumeAppender extends AbstractAppender implements FlumeEventF
@PluginAttribute("connectTimeout") final String connectionTimeout,
@PluginAttribute("requestTimeout") final String requestTimeout,
@PluginAttribute("agentRetries") final String agentRetries,
- @PluginAttribute("maxDelay") final String maxDelayMillis,
+ @PluginAliases("maxDelay") // deprecated
+ @PluginAttribute("maxDelayMillis") final String maxDelayMillis,
@PluginAttribute("name") final String name,
@PluginAttribute("ignoreExceptions") final String ignore,
@PluginAttribute("mdcExcludes") final String excludes,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a73ae666/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml
index 3f7f074..3b57099 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -491,9 +491,9 @@
default is 5.</td>
</tr>
<tr>
- <td>maxDelay</td>
+ <td>maxDelayMillis</td>
<td>integer</td>
- <td>The maximum number of seconds to wait for batchSize events before publishing the batch.</td>
+ <td>The maximum number of milliseconds to wait for batchSize events before publishing the batch.</td>
</tr>
<tr>
<td>mdcExcludes</td>