You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2020/02/09 20:09:49 UTC
[logging-log4j2] branch release-2.x updated (5d7f5c5 -> a1b952b)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 5d7f5c5 Update changes.xml
add 6f7fecc added log4j-kafka with "retryCount" function
add ebae079 added "KafkaAppenderWithRetryCount"
add 07d003d Delete pom.xml
add 370fe4c Delete KafkaAppenderCloseTimeoutTest.java
add 118121d Delete KafkaAppenderTest.java
add 9aa2bb9 Delete ConfigurationAssemblerTest.java
add 55b654c Delete ConfigurationBuilderTest.java
add 0f00315 Delete CustomConfigurationFactory.java
add ad599e7 Delete site.xml
add b62bc56 Delete index.md
add e3e819c Delete DefaultKafkaProducerFactory.java
add 72ef675 Delete KafkaAppender.java
add 1c5e64f Delete KafkaManager.java
add 6eff634 Delete KafkaProducerFactory.java
add 301898c Update KafkaAppender.java
add cf9d16f Update KafkaManager.java
add c3103bc added testAppendWithRetryCount
add b727221 modification KafkaManager and KafkaAppender
add 0649d39 kafkaAppender retryCount function added
add 8cbdb51 KafkaAppenderTest.xml 수정
add cbca794 Merge branch 'release-2.x' into release-2.x
add 90b5d2f Merge branch 'release-2.x' of https://github.com/joongs4/logging-log4j2 into release-2.x
new 8c0b19d Merge branch 'release-2.x' of https://github.com/joongs4/logging-log4j2 into joongs4-release-2.x
new a1b952b LOG4J2-2777 - Add a retry count to the Kafka Appender
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
log4j-core/pom.xml | 4 +-
.../core/appender/mom/kafka/KafkaAppender.java | 304 +++++++++++----------
.../core/appender/mom/kafka/KafkaManager.java | 277 ++++++++++---------
.../core/appender/mom/kafka/KafkaAppenderTest.java | 299 ++++++++++++--------
.../src/test/resources/KafkaAppenderTest.xml | 10 +-
src/changes/changes.xml | 3 +
6 files changed, 497 insertions(+), 400 deletions(-)
[logging-log4j2] 02/02: LOG4J2-2777 - Add a retry count to the
Kafka Appender
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a1b952bd472d27e9b2f7ff9bcc31b00fee4c2985
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Feb 9 13:08:27 2020 -0700
LOG4J2-2777 - Add a retry count to the Kafka Appender
---
.../logging/log4j/core/appender/mom/kafka/KafkaAppender.java | 10 ++++++++--
src/changes/changes.xml | 3 +++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
index 03a47bf..8aa4219 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
@@ -97,6 +97,11 @@ public final class KafkaAppender extends AbstractAppender {
return asBuilder();
}
+ public B setKey(final String key) {
+ this.key = key;
+ return asBuilder();
+ }
+
public Integer getRetryCount() {
Integer intRetryCount = null;
try {
@@ -113,7 +118,8 @@ public final class KafkaAppender extends AbstractAppender {
@Deprecated
public static KafkaAppender createAppender(final Layout<? extends Serializable> layout, final Filter filter,
final String name, final boolean ignoreExceptions, final String topic, final Property[] properties,
- final Configuration configuration, final String key, final Integer retryCount) {
+ final Configuration configuration,
+ final String key) {
if (layout == null) {
AbstractLifeCycle.LOGGER.error("No layout provided for KafkaAppender");
@@ -121,7 +127,7 @@ public final class KafkaAppender extends AbstractAppender {
}
final KafkaManager kafkaManager = KafkaManager.getManager(configuration.getLoggerContext(), name, topic, true,
properties, key);
- return new KafkaAppender(name, layout, filter, ignoreExceptions, kafkaManager, null, retryCount);
+ return new KafkaAppender(name, layout, filter, ignoreExceptions, kafkaManager, null, null);
}
/**
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f43ffe..2094c7d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
- "remove" - Removed
-->
<release version="2.13.1" date="2019-MM-DD" description="GA Release 2.13.1">
+ <action issue="LOG4J2-2777" dev="rgoers" type="update" due-to="joongs4">
+ Add a retry count attribute to the KafkaAppender.
+ </action>
<action issue="LOG4J2-2776" dev="rgoers" type="fix" due-to="Christoph Kaser">
An error message in RollingFileAppender uses a placeholder for the name but does not specify the name
argument in the logging call
[logging-log4j2] 01/02: Merge branch 'release-2.x' of
https://github.com/joongs4/logging-log4j2 into joongs4-release-2.x
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8c0b19df7251af9bbdd70add3129b8e7a77dbaf2
Merge: 5d7f5c5 90b5d2f
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Feb 9 00:12:16 2020 -0700
Merge branch 'release-2.x' of https://github.com/joongs4/logging-log4j2 into joongs4-release-2.x
log4j-core/pom.xml | 4 +-
.../core/appender/mom/kafka/KafkaAppender.java | 304 +++++++++++----------
.../core/appender/mom/kafka/KafkaManager.java | 277 ++++++++++---------
.../core/appender/mom/kafka/KafkaAppenderTest.java | 299 ++++++++++++--------
.../src/test/resources/KafkaAppenderTest.xml | 10 +-
5 files changed, 491 insertions(+), 403 deletions(-)