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 2019/12/08 21:06:08 UTC
[logging-log4j2] 01/03: Merge branch 'kafka-timestamp' of
https://github.com/fedexist/logging-log4j2 into fedexist-kafka-timestamp
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a2c72d234179a026cd13c4866df2195fdd58ec6d
Merge: 005f674 2cf2964
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Dec 8 13:58:10 2019 -0700
Merge branch 'kafka-timestamp' of https://github.com/fedexist/logging-log4j2 into fedexist-kafka-timestamp
.../log4j/kafka/appender/KafkaAppender.java | 19 ++++++++++++++++--
.../logging/log4j/kafka/appender/KafkaManager.java | 23 +++++++++++++++-------
.../log4j/kafka/appender/KafkaAppenderTest.java | 18 +++++++++++++++++
.../resources/KafkaAppenderCloseTimeoutTest.xml | 0
.../src/test/resources/KafkaAppenderTest.xml | 6 ++++++
5 files changed, 57 insertions(+), 9 deletions(-)
diff --cc log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
index 8f7de26,a0e8c64..36ab5ec
--- a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
+++ b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
@@@ -50,15 -50,18 +50,18 @@@ public final class KafkaAppender extend
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B>
implements org.apache.logging.log4j.plugins.util.Builder<KafkaAppender> {
- @PluginAttribute("topic")
+ @PluginAttribute
private String topic;
- @PluginAttribute("key")
+ @PluginAttribute
private String key;
- @PluginAttribute(value = "syncSend", defaultBoolean = true)
+ @PluginAttribute(defaultBoolean = true)
private boolean syncSend;
+ @PluginAttribute(value = "eventTimestamp", defaultBoolean = true)
+ private boolean sendEventTimestamp;
+
@SuppressWarnings("resource")
@Override
public KafkaAppender build() {