From 2416347beadf1c571a621a950f7bfb1406d928b1 Mon Sep 17 00:00:00 2001 From: andsel Date: Sun, 9 Dec 2018 17:11:11 +0100 Subject: [PATCH] Fix issue #437 use extend logger class name for messageLogger --- broker/src/main/java/io/moquette/broker/Server.java | 3 +-- .../java/io/moquette/broker/metrics/MQTTMessageLogger.java | 2 +- broker/src/test/resources/log4j.properties | 2 +- distribution/src/main/resources/log4j.properties | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/broker/src/main/java/io/moquette/broker/Server.java b/broker/src/main/java/io/moquette/broker/Server.java index a11c49c7..c661f04e 100644 --- a/broker/src/main/java/io/moquette/broker/Server.java +++ b/broker/src/main/java/io/moquette/broker/Server.java @@ -179,8 +179,7 @@ public class Server { ISubscriptionsDirectory subscriptions = new CTrieSubscriptionDirectory(); subscriptions.init(subscriptionsRepository); SessionRegistry sessions = new SessionRegistry(subscriptions, queueRepository); - dispatcher = new PostOffice(subscriptions, authorizatorPolicy, retainedRepository, sessions, - interceptor); + dispatcher = new PostOffice(subscriptions, authorizatorPolicy, retainedRepository, sessions, interceptor); final BrokerConfiguration brokerConfig = new BrokerConfiguration(config); MQTTConnectionFactory connectionFactory = new MQTTConnectionFactory(brokerConfig, authenticator, sessions, dispatcher); diff --git a/broker/src/main/java/io/moquette/broker/metrics/MQTTMessageLogger.java b/broker/src/main/java/io/moquette/broker/metrics/MQTTMessageLogger.java index e210ac00..198b0b6d 100644 --- a/broker/src/main/java/io/moquette/broker/metrics/MQTTMessageLogger.java +++ b/broker/src/main/java/io/moquette/broker/metrics/MQTTMessageLogger.java @@ -38,7 +38,7 @@ import static io.netty.channel.ChannelFutureListener.CLOSE_ON_FAILURE; @Sharable public class MQTTMessageLogger extends ChannelDuplexHandler { - private static final Logger LOG = LoggerFactory.getLogger("messageLogger"); + private static final Logger LOG = LoggerFactory.getLogger(MQTTMessageLogger.class); @Override public void channelRead(ChannelHandlerContext ctx, Object message) throws Exception { diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties index bc32b72d..7c50716f 100644 --- a/broker/src/test/resources/log4j.properties +++ b/broker/src/test/resources/log4j.properties @@ -40,4 +40,4 @@ log4j.appender.messagelog.MaxBackupIndex=1 log4j.appender.messagelog.layout=org.apache.log4j.PatternLayout log4j.appender.messagelog.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n -log4j.category.messageLogger=WARN, messagelog +log4j.category.io.moquette.broker.metrics.MQTTMessageLogger=WARN, messagelog diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties index 74f85c14..cd425462 100644 --- a/distribution/src/main/resources/log4j.properties +++ b/distribution/src/main/resources/log4j.properties @@ -44,4 +44,4 @@ log4j.appender.messagelog.MaxBackupIndex=1 log4j.appender.messagelog.layout=org.apache.log4j.PatternLayout log4j.appender.messagelog.layout.ConversionPattern=%d{dd/MM/yyyy HH:mm:ss,SSS} [%t] %-5p %c{1} %L %x - %m%n -log4j.category.messageLogger=WARN, messagelog +log4j.category.io.moquette.broker.metrics.MQTTMessageLogger=WARN, messagelog