svn commit: r37140 - /dev/logging/log4j/
Author: rgoers Date: Mon Dec 9 05:01:23 2019 New Revision: 37140 Log: Log4j 2.13.0 RC1 Added: dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz (with props) dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.asc dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.sha512 dev/logging/log4j/apache-log4j-2.13.0-bin.zip (with props) dev/logging/log4j/apache-log4j-2.13.0-bin.zip.asc dev/logging/log4j/apache-log4j-2.13.0-bin.zip.sha512 dev/logging/log4j/apache-log4j-2.13.0-site.zip (with props) dev/logging/log4j/apache-log4j-2.13.0-site.zip.asc dev/logging/log4j/apache-log4j-2.13.0-site.zip.sha512 dev/logging/log4j/apache-log4j-2.13.0-src.tar.gz (with props) dev/logging/log4j/apache-log4j-2.13.0-src.tar.gz.asc dev/logging/log4j/apache-log4j-2.13.0-src.tar.gz.sha512 dev/logging/log4j/apache-log4j-2.13.0-src.zip (with props) dev/logging/log4j/apache-log4j-2.13.0-src.zip.asc dev/logging/log4j/apache-log4j-2.13.0-src.zip.sha512 Removed: dev/logging/log4j/apache-log4j-2.12.1-bin.tar.gz dev/logging/log4j/apache-log4j-2.12.1-bin.tar.gz.asc dev/logging/log4j/apache-log4j-2.12.1-bin.tar.gz.sha512 dev/logging/log4j/apache-log4j-2.12.1-bin.zip dev/logging/log4j/apache-log4j-2.12.1-bin.zip.asc dev/logging/log4j/apache-log4j-2.12.1-bin.zip.sha512 dev/logging/log4j/apache-log4j-2.12.1-site.zip dev/logging/log4j/apache-log4j-2.12.1-site.zip.asc dev/logging/log4j/apache-log4j-2.12.1-site.zip.sha512 dev/logging/log4j/apache-log4j-2.12.1-src.tar.gz dev/logging/log4j/apache-log4j-2.12.1-src.tar.gz.asc dev/logging/log4j/apache-log4j-2.12.1-src.tar.gz.sha512 dev/logging/log4j/apache-log4j-2.12.1-src.zip dev/logging/log4j/apache-log4j-2.12.1-src.zip.asc dev/logging/log4j/apache-log4j-2.12.1-src.zip.sha512 Added: dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.asc == --- dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.asc (added) +++ dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.asc Mon Dec 9 05:01:23 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEU8k1ghqmp1W9M321NZU5XrPY4boFAl3tkOYACgkQNZU5XrPY +4bpXDhAAj46oKRouQz+PGO+PG7doCtpLZhRR/XFEU9X/QzGgBR1Eog3M+AA1CltQ +GFuEcbzY+oWgaWQTFl++KmKGdMEEkXDodQ7HoXsln65yNn9BFEc1s+zsRLD9+RSg +YfHTanoajJrCAGMzO92OkSue+B957yYeueugNmWPRwIpGOMeP/1FHCdxNZWHX0vk +G/lfn5VyfQiUoHo5V/jI1YVIrW8fW7wZYotz5oJD6IdB9tW6W2ovRkT6qOPKrrIX +Si1wlxVAVmHwubN2Y/K+7UUPbXL+QpryGMpXm19pbb60oVmnfTTsZlOhX47FygM+ +zZsi0GYNIsSPY0QfGkFdc+5I66XOPqPckUaRa1MZ6tn86VuST+50jwQA8k4dGTdH +wf/8CL3osgA9PjrauPmEbxvWpsQ8J0DKuse2RBHPF3Ql7uJKxa67fbEusJhMFYfq +HiAQHQHgY4yIXQ/XSZm71zHRP1w2PHe36gAGkO/RvIkylA/YTCxKpdSCdJB7WlYz +y6nzLjkv53jWPSQ1M2/CF7RwIRRdM/prTvx0Cg6m6RRLCY/1yelF+gFm7DaKvmdQ +2cEZ6aL3nDokXLK/Db9f9CgzW07tNROcpViOT0TvYlum8ozf+mIicAI9hRwZsZEI +78OEPNBErdW2n9NVICW8+oHxFeLTweqQkENMZvZ0Q2iApQRmuiQ= +=+kP/ +-END PGP SIGNATURE- Added: dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.sha512 == --- dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.sha512 (added) +++ dev/logging/log4j/apache-log4j-2.13.0-bin.tar.gz.sha512 Mon Dec 9 05:01:23 2019 @@ -0,0 +1,4 @@ +apache-log4j-2.13.0-bin.tar.gz: 44C2AA3B 4FBA6700 95A1EC7E B67945BC 78D308FF +BCD4FE64 C5C986FD FA7F2F10 174490DB 1F342EA8 +C3ABD0CE F90EB611 86582071 2CE59F84 A46A4F8C +7E13F946 Added: dev/logging/log4j/apache-log4j-2.13.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/log4j/apache-log4j-2.13.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/log4j/apache-log4j-2.13.0-bin.zip.asc == --- dev/logging/log4j/apache-log4j-2.13.0-bin.zip.asc (added) +++ dev/logging/log4j/apache-log4j-2.13.0-bin.zip.asc Mon Dec 9 05:01:23 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEU8k1ghqmp1W9M321NZU5XrPY4boFAl3tkOYACgkQNZU5XrPY +4bqxBhAAoVEWSTm9vxWI3vneGMP62IGM653bLA7cJLq/cZIzsMIU4ntCLHFdR4P1 +wIeSmrSBkx62FopF58d7kdc5Eh8qZo1Q3EiWgQXwngudWsbDwTGJ+kXgP5eiUnqP +uFwGb3cayZ/MeJbckixw4ZrSFiXt3mzfxGO9kcIwJz5bw+9pCe8DiD9Z9Ngw+/sK +ioimCJ+yfNbRCwGE5JBXVNonnFs0td52AxUvsWZYJETEanqPIopqaEq+iNn8W9LF
[logging-log4j2] branch release-2.x updated: [maven-release-plugin] prepare for next development iteration
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 The following commit(s) were added to refs/heads/release-2.x by this push: new ec11e79 [maven-release-plugin] prepare for next development iteration ec11e79 is described below commit ec11e79f3d29caae2769a00f07f88e0d5618d839 Author: rgoers AuthorDate: Sun Dec 8 17:10:43 2019 -0700 [maven-release-plugin] prepare for next development iteration --- log4j-1.2-api/pom.xml | 2 +- log4j-api-java9/pom.xml | 2 +- log4j-api/pom.xml | 2 +- log4j-appserver/pom.xml | 2 +- log4j-bom/pom.xml | 6 +- log4j-cassandra/pom.xml | 2 +- log4j-core-its/pom.xml | 2 +- log4j-core-java9/pom.xml| 2 +- log4j-core/pom.xml | 2 +- log4j-couchdb/pom.xml | 2 +- log4j-distribution/pom.xml | 2 +- log4j-docker/pom.xml| 2 +- log4j-flume-ng/pom.xml | 2 +- log4j-iostreams/pom.xml | 2 +- log4j-jcl/pom.xml | 2 +- log4j-jdbc-dbcp2/pom.xml| 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jpa/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- log4j-kubernetes/pom.xml| 2 +- log4j-liquibase/pom.xml | 2 +- log4j-mongodb2/pom.xml | 2 +- log4j-mongodb3/pom.xml | 2 +- log4j-osgi/pom.xml | 2 +- log4j-perf/pom.xml | 4 ++-- log4j-samples/log4j-samples-configuration/pom.xml | 2 +- log4j-samples/log4j-samples-flume-common/pom.xml| 2 +- log4j-samples/log4j-samples-flume-embedded/pom.xml | 2 +- log4j-samples/log4j-samples-flume-remote/pom.xml| 2 +- log4j-samples/log4j-samples-loggerProperties/pom.xml| 2 +- log4j-samples/pom.xml | 2 +- log4j-slf4j-impl/pom.xml| 2 +- log4j-slf4j18-impl/pom.xml | 2 +- log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml | 2 +- .../log4j-spring-cloud-config-sample-application/pom.xml| 2 +- .../log4j-spring-cloud-config-sample-server/pom.xml | 6 +- log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml | 2 +- log4j-spring-cloud-config/pom.xml | 2 +- log4j-taglib/pom.xml| 2 +- log4j-to-slf4j/pom.xml | 2 +- log4j-web/pom.xml | 2 +- pom.xml | 4 ++-- 42 files changed, 44 insertions(+), 52 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index 0699ab4..7e559ba 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j -2.13.0 +2.13.1-SNAPSHOT ../ log4j-1.2-api diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml index 516169e..266575c 100644 --- a/log4j-api-java9/pom.xml +++ b/log4j-api-java9/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j -2.13.0 +2.13.1-SNAPSHOT ../ log4j-api-java9 diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index a5e436f..61891e5 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j -2.13.0 +2.13.1-SNAPSHOT ../ log4j-api diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml index 491bd7e..c04ad90 100644 --- a/log4j-appserver/pom.xml +++ b/log4j-appserver/pom.xml @@ -20,7 +20,7 @@ log4j org.apache.logging.log4j -2.13.0 +2.13.1-SNAPSHOT 4.0.0 diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index d2eea46..cd3e941 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml
[logging-log4j2] branch release-2.x updated: [maven-release-plugin] prepare release log4j-2.13.0-rc1
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 The following commit(s) were added to refs/heads/release-2.x by this push: new fc7dc9c [maven-release-plugin] prepare release log4j-2.13.0-rc1 fc7dc9c is described below commit fc7dc9c03cc4e651a760cbc80492bfbfec0af83d Author: rgoers AuthorDate: Sun Dec 8 17:10:18 2019 -0700 [maven-release-plugin] prepare release log4j-2.13.0-rc1 --- log4j-1.2-api/pom.xml | 2 +- log4j-api-java9/pom.xml | 2 +- log4j-api/pom.xml | 2 +- log4j-appserver/pom.xml | 2 +- log4j-bom/pom.xml | 6 +- log4j-cassandra/pom.xml | 2 +- log4j-core-its/pom.xml | 2 +- log4j-core-java9/pom.xml| 2 +- log4j-core/pom.xml | 2 +- log4j-couchdb/pom.xml | 2 +- log4j-distribution/pom.xml | 2 +- log4j-docker/pom.xml| 2 +- log4j-flume-ng/pom.xml | 2 +- log4j-iostreams/pom.xml | 2 +- log4j-jcl/pom.xml | 2 +- log4j-jdbc-dbcp2/pom.xml| 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jpa/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- log4j-kubernetes/pom.xml| 2 +- log4j-liquibase/pom.xml | 2 +- log4j-mongodb2/pom.xml | 2 +- log4j-mongodb3/pom.xml | 2 +- log4j-osgi/pom.xml | 2 +- log4j-perf/pom.xml | 4 ++-- log4j-samples/log4j-samples-configuration/pom.xml | 2 +- log4j-samples/log4j-samples-flume-common/pom.xml| 2 +- log4j-samples/log4j-samples-flume-embedded/pom.xml | 2 +- log4j-samples/log4j-samples-flume-remote/pom.xml| 2 +- log4j-samples/log4j-samples-loggerProperties/pom.xml| 2 +- log4j-samples/pom.xml | 2 +- log4j-slf4j-impl/pom.xml| 2 +- log4j-slf4j18-impl/pom.xml | 2 +- log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml | 2 +- .../log4j-spring-cloud-config-sample-application/pom.xml| 2 +- .../log4j-spring-cloud-config-sample-server/pom.xml | 6 +- log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml | 2 +- log4j-spring-cloud-config/pom.xml | 2 +- log4j-taglib/pom.xml| 2 +- log4j-to-slf4j/pom.xml | 2 +- log4j-web/pom.xml | 2 +- pom.xml | 4 ++-- 42 files changed, 52 insertions(+), 44 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index f5bc7e5..0699ab4 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j -2.13.0-SNAPSHOT +2.13.0 ../ log4j-1.2-api diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml index a4d6655..516169e 100644 --- a/log4j-api-java9/pom.xml +++ b/log4j-api-java9/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j -2.13.0-SNAPSHOT +2.13.0 ../ log4j-api-java9 diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index c3239cf..a5e436f 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j -2.13.0-SNAPSHOT +2.13.0 ../ log4j-api diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml index 7ec3cbf..491bd7e 100644 --- a/log4j-appserver/pom.xml +++ b/log4j-appserver/pom.xml @@ -20,7 +20,7 @@ log4j org.apache.logging.log4j -2.13.0-SNAPSHOT +2.13.0 4.0.0 diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index 525668a..d2eea46 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@ -26,7
[logging-log4j2] annotated tag log4j-2.13.0-rc1 created (now f43dca1)
This is an automated email from the ASF dual-hosted git repository. rgoers pushed a change to annotated tag log4j-2.13.0-rc1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git. at f43dca1 (tag) tagging fc7dc9c03cc4e651a760cbc80492bfbfec0af83d (commit) replaces log4j-2.12.1 by rgoers on Sun Dec 8 17:10:37 2019 -0700 - Log - [maven-release-plugin] copy for tag log4j-2.13.0-rc1 --- No new revisions were added by this update.
[logging-log4j2] branch release-2.x updated: Prepare for relesae
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 The following commit(s) were added to refs/heads/release-2.x by this push: new 5021aa8 Prepare for relesae 5021aa8 is described below commit 5021aa81411aee519d48f2940b31ee626e5cba1c Author: Ralph Goers AuthorDate: Sun Dec 8 14:32:49 2019 -0700 Prepare for relesae --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 753e0b9..974cd50 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -29,7 +29,7 @@ - "update" - Change - "remove" - Removed --> - + Prevent recursive calls to java.util.LogManager.getLogger().
[logging-log4j2] branch release-2.x updated: Prepare for relesae
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 The following commit(s) were added to refs/heads/release-2.x by this push: new 8f529c9 Prepare for relesae 8f529c9 is described below commit 8f529c9072b105f280d22dfbf49ebb0e4131b221 Author: Ralph Goers AuthorDate: Sun Dec 8 14:31:56 2019 -0700 Prepare for relesae --- RELEASE-NOTES.md | 21 + 1 file changed, 21 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index b32329c..c13867b 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -56,6 +56,10 @@ The Log4j 2.13.0 API, as well as many core components, maintains binary compatib Changes in this version include: ### New Features +* [LOG4J2-2732](https://issues.apache.org/jira/browse/LOG4J2-2732): +Add ThreadContext.putIfNotNull method. Thanks to Matt Pavlovich. +* [LOG4J2-2731](https://issues.apache.org/jira/browse/LOG4J2-2731): +Add a Level Patttern Selector. * [LOG4J2-63](https://issues.apache.org/jira/browse/LOG4J2-63): Add experimental support for Log4j 1 configuration files. * [LOG4J2-2716](https://issues.apache.org/jira/browse/LOG4J2-2716): @@ -68,6 +72,19 @@ Allow Spring Boot application properties to be accessed in the Log4j 2 configura Add builder pattern to Logger interface. ### Fixed Bugs +* [LOG4J2-2058](https://issues.apache.org/jira/browse/LOG4J2-2058): +Prevent recursive calls to java.util.LogManager.getLogger(). +* [LOG4J2-2725](https://issues.apache.org/jira/browse/LOG4J2-2725): +LOG4J2-2725 - Added try/finally around event.execute() for RingBufferLogEventHandler to clear memory +correctly in case of exception/error Thanks to Dzmitry Anikechanka. +* [LOG4J2-2635](https://issues.apache.org/jira/browse/LOG4J2-2635): +Wrong java version check in ThreadNameCachingStrategy. Thanks to Filipp Gunbin. +* [LOG4J2-2674](https://issues.apache.org/jira/browse/LOG4J2-2674): +Use a less confusing name for the CompositeConfiguration source. Thanks to Anton Korenkov. +* [LOG4J2-2727](https://issues.apache.org/jira/browse/LOG4J2-2727): +Add setKey method to Kafka Appender Builder. Thanks to Clément Mathieu. +* [LOG4J2-2707](https://issues.apache.org/jira/browse/LOG4J2-2707): +ArrayIndexOutOfBoundsException could occur with MAC address longer than 6 bytes. Thanks to Christian Frank. * [LOG4J2-2712](https://issues.apache.org/jira/browse/LOG4J2-2712): The rolling file appenders would fail to compress the file after rollover if the file name matched the file pattern. @@ -81,8 +98,12 @@ Set result of rename action to true if file was copied. Thanks to Guillermo Xavi Add automatic module names where missing. Thanks to Stephen Colebourne. * [LOG4J2-2673](https://issues.apache.org/jira/browse/LOG4J2-2673): OutputStreamAppender.Builder ignores setFilter(). Thanks to Yuichi Sugimura. +* [LOG4J2-2725](https://issues.apache.org/jira/browse/LOG4J2-2725): +Prevent a memory leak when async loggers throw errors. Thanks to Dzmitry Anikechanka. ### Changes +* [LOG4J2-2701](https://issues.apache.org/jira/browse/LOG4J2-2701): +Update Jackson to 2.9.10. * [LOG4J2-2709](https://issues.apache.org/jira/browse/LOG4J2-2709): Allow message portion of GELF layout to be formatted using a PatternLayout. Allow ThreadContext attributes to be explicitly included or excluded in the GelfLayout.
[logging-log4j2] 03/03: Merge branch '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 361707f090a3d0e0faa003b5929bc016180894f8 Merge: 005f674 1ba29fa Author: Ralph Goers AuthorDate: Sun Dec 8 14:05:46 2019 -0700 Merge branch '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 ++ src/changes/changes.xml| 3 +++ 6 files changed, 60 insertions(+), 9 deletions(-)
[logging-log4j2] branch master updated (005f674 -> 361707f)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 005f674 Merge branch
'rmannibucau-LOG4J2-2523_session-attr-support-for-web-lookups'
add b4f739c Add support for LogEvent timestamp embedding in ProducerRecord
add 290e194 Add test
add 5b10d64 Update default behaviour to send LogEvent timestamp as Kafka
ProducerRecord timestamp Change 'timestamp' attribute name to 'eventTimestamp'
Update tests and test configuration
add 655986b Match coding style
add 2cf2964 Move KafkaAppenderTest.xml and
KafkaAppenderCloseTimeoutTest.xml
new a2c72d2 Merge branch 'kafka-timestamp' of
https://github.com/fedexist/logging-log4j2 into fedexist-kafka-timestamp
new 1ba29fa LOG4J2-2678 - Add LogEvent timestamp to ProducerRecord in
KafkaAppender
new 361707f Merge branch 'fedexist-kafka-timestamp'
The 3 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/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 ++
src/changes/changes.xml| 3 +++
6 files changed, 60 insertions(+), 9 deletions(-)
rename {log4j-core =>
log4j-kafka}/src/test/resources/KafkaAppenderCloseTimeoutTest.xml (100%)
rename {log4j-core => log4j-kafka}/src/test/resources/KafkaAppenderTest.xml
(86%)
[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
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> extends
AbstractAppender.Builder
implements
org.apache.logging.log4j.plugins.util.Builder {
-@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() {
[logging-log4j2] 02/03: LOG4J2-2678 - Add LogEvent timestamp to ProducerRecord in KafkaAppender
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 1ba29faf751d1debf115fb070b04fe5a212475e5 Author: Ralph Goers AuthorDate: Sun Dec 8 14:05:02 2019 -0700 LOG4J2-2678 - Add LogEvent timestamp to ProducerRecord in KafkaAppender --- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f9bf359..2f6fdbb 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -31,6 +31,9 @@ - "remove" - Removed --> + +Add LogEvent timestamp to ProducerRecord in KafkaAppender. + Allow web lookup of session attributes.
