Commit e4ee8a23 authored by Mikael Ståldal's avatar Mikael Ståldal
Browse files

LOG4J2-1889 Move KafkaAppender to new module

No related merge requests found
Showing with 7 additions and 11 deletions
+7 -11
......@@ -26,7 +26,6 @@ public interface Appenders {
interface CouchDb {}
interface Jms {}
interface Jpa {}
interface Kafka {}
interface MongoDb {}
interface Smtp {}
interface ZeroMq {}
......
......@@ -31,7 +31,7 @@ import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.mom.kafka.KafkaAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.Configurator;
......@@ -90,8 +90,8 @@ public class ConfigurationAssemblerTest {
final Map<String, Appender> appenders = config.getAppenders();
assertNotNull(appenders);
assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 2);
final KafkaAppender kafkaAppender = (KafkaAppender)appenders.get("Kafka");
final GelfLayout gelfLayout = (GelfLayout)kafkaAppender.getLayout();
final SocketAppender socketAppender = (SocketAppender)appenders.get("Socket");
final GelfLayout gelfLayout = (GelfLayout)socketAppender.getLayout();
final Map<String, LoggerConfig> loggers = config.getLoggers();
assertNotNull(loggers);
assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
......
......@@ -50,7 +50,7 @@ public class ConfigurationBuilderTest {
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
builder.add(appenderBuilder);
final AppenderComponentBuilder appenderBuilder2 = builder.newAppender("Kafka", "Kafka").addAttribute("topic", "my-topic");
final AppenderComponentBuilder appenderBuilder2 = builder.newAppender("Socket", "Socket").addAttribute("port", "12201");
appenderBuilder2.addComponent(builder.newProperty("bootstrap.servers", "localhost:9092"));
appenderBuilder2.add(builder.newLayout("GelfLayout").
addAttribute("host", "my-host").
......@@ -85,12 +85,12 @@ public class ConfigurationBuilderTest {
INDENT + INDENT + INDENT + "<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + EOL +
INDENT + INDENT + INDENT + "<MarkerFilter onMatch=\"DENY\" onMisMatch=\"NEUTRAL\" marker=\"FLOW\"/>" + EOL +
INDENT + INDENT + "</CONSOLE>" + EOL +
INDENT + INDENT + "<Kafka name=\"Kafka\" topic=\"my-topic\">" + EOL +
INDENT + INDENT + "<Socket name=\"Socket\" port=\"12201\">" + EOL +
INDENT + INDENT + INDENT + "<Property name=\"bootstrap.servers\">localhost:9092</Property>" + EOL +
INDENT + INDENT + INDENT + "<GelfLayout host=\"my-host\">" + EOL +
INDENT + INDENT + INDENT + INDENT + "<KeyValuePair key=\"extraField\" value=\"extraValue\"/>" + EOL +
INDENT + INDENT + INDENT + "</GelfLayout>" + EOL +
INDENT + INDENT + "</Kafka>" + EOL +
INDENT + INDENT + "</Socket>" + EOL +
INDENT + "</Appenders>" + EOL +
INDENT + "<Loggers>" + EOL +
INDENT + INDENT + "<Logger name=\"org.apache.logging.log4j\" level=\"DEBUG\" includeLocation=\"true\" additivity=\"false\">" + EOL +
......
......@@ -51,7 +51,7 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
Filter.Result.NEUTRAL).addAttribute("marker", "FLOW"));
builder.add(appenderBuilder);
final AppenderComponentBuilder appenderBuilder2 = builder.newAppender("Kafka", "Kafka").addAttribute("topic", "my-topic");
final AppenderComponentBuilder appenderBuilder2 = builder.newAppender("Socket", "Socket").addAttribute("port", "12201");
appenderBuilder2.addComponent(builder.newProperty("bootstrap.servers", "localhost:9092"));
appenderBuilder2.add(builder.newLayout("GelfLayout").
addAttribute("host", "my-host").
......
......@@ -30,7 +30,6 @@ import org.apache.kafka.clients.producer.MockProducer;
import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.categories.Appenders;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
......@@ -40,11 +39,9 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import static org.junit.Assert.*;
@Category(Appenders.Kafka.class)
public class KafkaAppenderTest {
private static final MockProducer<byte[], byte[]> kafka = new MockProducer<byte[], byte[]>(true, null, null) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment