You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/05/20 13:37:46 UTC
logging-log4j2 git commit: Remove workaround for now solved Kafka
issue
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1390 [created] 3fac1c7e9
Remove workaround for now solved Kafka issue
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3fac1c7e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3fac1c7e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3fac1c7e
Branch: refs/heads/LOG4J2-1390
Commit: 3fac1c7e9a3b9c8b39b23b5160e1ffeb81e23bad
Parents: 96436fb
Author: Mikael St�ldal <mi...@magine.com>
Authored: Fri May 20 15:37:34 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Fri May 20 15:37:34 2016 +0200
----------------------------------------------------------------------
.../core/appender/mom/kafka/KafkaManager.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3fac1c7e/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
index 4e4a09c..dab2c4e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaManager.java
@@ -26,7 +26,6 @@ import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.logging.log4j.core.appender.AbstractManager;
import org.apache.logging.log4j.core.config.Property;
-import org.apache.logging.log4j.core.util.Log4jThread;
public class KafkaManager extends AbstractManager {
@@ -58,21 +57,7 @@ public class KafkaManager extends AbstractManager {
@Override
public void releaseSub() {
if (producer != null) {
- // This thread is a workaround for this Kafka issue: https://issues.apache.org/jira/browse/KAFKA-1660
- final Thread closeThread = new Log4jThread(new Runnable() {
- @Override
- public void run() {
- producer.close();
- }
- });
- closeThread.setName("KafkaManager-CloseThread");
- closeThread.setDaemon(true); // avoid blocking JVM shutdown
- closeThread.start();
- try {
- closeThread.join(timeoutMillis);
- } catch (final InterruptedException ignore) {
- // ignore
- }
+ producer.close(timeoutMillis, TimeUnit.MILLISECONDS);
}
}