You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/03/07 01:54:48 UTC
[1/3] logging-log4j2 git commit: Add element type const for Appender.
Repository: logging-log4j2
Updated Branches:
refs/heads/master ce9a8f871 -> ba18a929c
Add element type const for Appender.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f83ab805
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f83ab805
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f83ab805
Branch: refs/heads/master
Commit: f83ab80534875a9bc5b7080f39b61e8e10d9857b
Parents: ce9a8f8
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Mar 6 18:44:55 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Mar 6 18:44:55 2016 -0600
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/core/Appender.java | 8 ++++++++
.../src/main/java/org/apache/logging/log4j/core/Layout.java | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f83ab805/log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java
index 51483dc..91a0932 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java
@@ -37,6 +37,14 @@ import java.io.Serializable;
public interface Appender extends LifeCycle {
/**
+ * Main {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#elementType() plugin element type} for
+ * Appender plugins.
+ *
+ * @since 2.6
+ */
+ String ELEMENT_TYPE = "appender";
+
+ /**
* Logs a LogEvent using whatever logic this Appender wishes to use. It is typically recommended to use a
* bridge pattern not only for the benefits from decoupling an Appender from its implementation, but it is also
* handy for sharing resources which may require some form of locking.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f83ab805/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
index 6385183..73b5d6f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
@@ -47,7 +47,8 @@ import org.apache.logging.log4j.core.layout.Encoder;
public interface Layout<T extends Serializable> extends Encoder<LogEvent> {
/**
- * Main plugin element type for Layout plugins.
+ * Main {@linkplain org.apache.logging.log4j.core.config.plugins.Plugin#elementType() plugin element type} for
+ * Layout plugins.
*
* @since 2.1
*/
[3/3] logging-log4j2 git commit: Add useful toString() on
KafkaAppender.
Posted by ma...@apache.org.
Add useful toString() on KafkaAppender.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ba18a929
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ba18a929
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ba18a929
Branch: refs/heads/master
Commit: ba18a929c14ca68d361dcd69227482f4f922cd1a
Parents: 7032e32
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Mar 6 18:54:39 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Mar 6 18:54:39 2016 -0600
----------------------------------------------------------------------
.../logging/log4j/core/appender/mom/kafka/KafkaAppender.java | 7 +++++++
.../logging/log4j/core/appender/mom/kafka/KafkaManager.java | 4 ++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba18a929/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
----------------------------------------------------------------------
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 4162744..7743e57 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
@@ -102,4 +102,11 @@ public final class KafkaAppender extends AbstractAppender {
manager.release();
}
+ @Override
+ public String toString() {
+ return "KafkaAppender{" +
+ "name=" + getName() +
+ ", topic=" + manager.getTopic() +
+ '}';
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba18a929/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 ca141b0..4e4a09c 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
@@ -86,4 +86,8 @@ public class KafkaManager extends AbstractManager {
producer = producerFactory.newKafkaProducer(config);
}
+ public String getTopic() {
+ return topic;
+ }
+
}
[2/3] logging-log4j2 git commit: Use constants for plugin metadata.
Posted by ma...@apache.org.
Use constants for plugin metadata.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7032e329
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7032e329
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7032e329
Branch: refs/heads/master
Commit: 7032e3292764e8caf4cb8bf41b13793270e2d8ca
Parents: f83ab80
Author: Matt Sicker <bo...@gmail.com>
Authored: Sun Mar 6 18:47:17 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sun Mar 6 18:47:17 2016 -0600
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/mom/JmsAppender.java | 4 +++-
.../logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java | 4 +++-
.../logging/log4j/core/appender/mom/kafka/KafkaAppender.java | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7032e329/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
index e454373..53b6ebb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
@@ -22,11 +22,13 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
+import org.apache.logging.log4j.core.config.Node;
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.PluginBuilderAttribute;
@@ -40,7 +42,7 @@ import org.apache.logging.log4j.core.net.JndiManager;
* Generic JMS Appender plugin for both queues and topics. This Appender replaces the previous split ones. However,
* configurations set up for the 2.0 version of the JMS appenders will still work.
*/
-@Plugin(name = "JMS", category = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "JMS", category = Node.CATEGORY, elementType = Appender.ELEMENT_TYPE, printObject = true)
@PluginAliases({"JMSQueue", "JMSTopic"})
public class JmsAppender extends AbstractAppender {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7032e329/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
index 058427f..2ce0bfd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java
@@ -24,10 +24,12 @@ import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Node;
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.PluginAttribute;
@@ -52,7 +54,7 @@ import org.zeromq.ZMQ.Socket;
// Some methods are synchronized because a ZMQ.Socket is not thread-safe
// Using a ThreadLocal for the publisher hangs tests on shutdown. There must be
// some issue on threads owning certain resources as opposed to others.
-@Plugin(name = "JeroMQ", category = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "JeroMQ", category = Node.CATEGORY, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class JeroMqAppender extends AbstractAppender {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7032e329/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppender.java
----------------------------------------------------------------------
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 ea6484e..4162744 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
@@ -20,11 +20,13 @@ package org.apache.logging.log4j.core.appender.mom.kafka;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
+import org.apache.logging.log4j.core.config.Node;
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.PluginAttribute;
@@ -37,7 +39,7 @@ import org.apache.logging.log4j.core.util.StringEncoder;
/**
* Sends log events to an Apache Kafka topic.
*/
-@Plugin(name = "Kafka", category = "Core", elementType = "appender", printObject = true)
+@Plugin(name = "Kafka", category = Node.CATEGORY, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class KafkaAppender extends AbstractAppender {
@PluginFactory