From 44a7c4d000376a1223eaee197c2cac18fcbab2c1 Mon Sep 17 00:00:00 2001
From: Andreas Mager <andreas@mager.eu>
Date: Tue, 25 Apr 2017 16:03:09 +0200
Subject: [PATCH 1/2] broker/MQTTMessageLogger: missing messages added

---
 .../moquette/server/netty/metrics/MQTTMessageLogger.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java b/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java
index 9fc7a9e0..219c59dd 100644
--- a/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java
+++ b/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java
@@ -76,6 +76,15 @@ public class MQTTMessageLogger extends ChannelDuplexHandler {
             case PUBACK:
                 LOG.info("{} PUBACK <{}> packetID <{}>", direction, clientID, messageId(msg));
                 break;
+
+            case CONNACK:
+            case SUBACK:
+            case PINGREQ:
+            case PINGRESP:
+            case UNSUBACK:
+                LOG.debug("{} {} <{}> packetID <{}>", direction, messageType, clientID, messageId(msg));
+                break;
+
             default:
                 LOG.error("Unkonwn MessageType:{}", messageType);
                 break;

From 0247cfef9eed6009384d0eab649181591b0109b9 Mon Sep 17 00:00:00 2001
From: Andreas Mager <andreas@mager.eu>
Date: Tue, 25 Apr 2017 16:07:01 +0200
Subject: [PATCH 2/2] broker/MQTTMessageLogger: log cases squashed

---
 .../server/netty/metrics/MQTTMessageLogger.java  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java b/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java
index 219c59dd..ccd97bf7 100644
--- a/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java
+++ b/broker/src/main/java/io/moquette/server/netty/metrics/MQTTMessageLogger.java
@@ -46,8 +46,10 @@ public class MQTTMessageLogger extends ChannelDuplexHandler {
         MqttMessageType messageType = msg.fixedHeader().messageType();
         switch (messageType) {
             case CONNECT:
-                LOG.info("{} CONNECT client <{}>", direction, clientID);
+            case DISCONNECT:
+                LOG.info("{} {} <{}>", direction, messageType, clientID);
                 break;
+
             case SUBSCRIBE:
                 MqttSubscribeMessage subscribe = (MqttSubscribeMessage) msg;
                 LOG.info("{} SUBSCRIBE <{}> to topics {}", direction, clientID,
@@ -61,20 +63,12 @@ public class MQTTMessageLogger extends ChannelDuplexHandler {
                 MqttPublishMessage publish = (MqttPublishMessage) msg;
                 LOG.info("{} PUBLISH <{}> to topics <{}>", direction, clientID, publish.variableHeader().topicName());
                 break;
+
             case PUBREC:
-                LOG.info("{} PUBREC <{}> packetID <{}>", direction, clientID, messageId(msg));
-                break;
             case PUBCOMP:
-                LOG.info("{} PUBCOMP <{}> packetID <{}>", direction, clientID, messageId(msg));
-                break;
             case PUBREL:
-                LOG.info("{} PUBREL <{}> packetID <{}>", direction, clientID, messageId(msg));
-                break;
-            case DISCONNECT:
-                LOG.info("{} DISCONNECT <{}>", direction, clientID);
-                break;
             case PUBACK:
-                LOG.info("{} PUBACK <{}> packetID <{}>", direction, clientID, messageId(msg));
+                LOG.info("{} {} <{}> packetID <{}>", direction, messageType, clientID, messageId(msg));
                 break;
 
             case CONNACK: