✨ mqtt 日志优化。

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/DefaultMqttClientProcessor.java

@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
 import org.tio.core.ChannelContext;
 import org.tio.core.Node;
 import org.tio.core.Tio;
-import org.tio.core.TioConfig;
 
 import java.nio.ByteBuffer;
 import java.util.List;

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServer.java

@@ -125,12 +125,12 @@ public final class MqttServer {
 	public boolean publish(String clientId, String topic, ByteBuffer payload, MqttQoS qos, boolean retain) {
 		ChannelContext context = Tio.getByBsId(getServerConfig(), clientId);
 		if (context == null || context.isClosed) {
-			logger.warn("Mqtt publish to clientId:{} ChannelContext is null may be disconnected.", clientId);
+			logger.warn("Mqtt Topic:{} publish to clientId:{} ChannelContext is null may be disconnected.", topic, clientId);
 			return false;
 		}
 		List<Subscribe> subscribeList = sessionManager.searchSubscribe(topic, clientId);
 		if (subscribeList.isEmpty()) {
-			logger.warn("Mqtt publish but clientId:{} subscribeList is empty.", clientId);
+			logger.warn("Mqtt Topic:{} publish but clientId:{} subscribeList is empty.", topic, clientId);
 			return false;
 		}
 		for (Subscribe subscribe : subscribeList) {
@@ -163,7 +163,7 @@ public final class MqttServer {
 			.messageId(messageId)
 			.build();
 		boolean result = Tio.send(context, message);
-		logger.debug("MQTT publish topic:{} qos:{} retain:{} result:{}", topic, qos, retain, result);
+		logger.info("MQTT Topic:{} qos:{} retain:{} publish result:{}", topic, qos, retain, result);
 		if (isHighLevelQoS) {
 			MqttPendingPublish pendingPublish = new MqttPendingPublish(payload, message, qos);
 			sessionManager.addPendingPublish(clientId, messageId, pendingPublish);
@@ -220,14 +220,14 @@ public final class MqttServer {
 		// 查找订阅该 topic 的客户端
 		List<Subscribe> subscribeList = sessionManager.searchSubscribe(topic);
 		if (subscribeList.isEmpty()) {
-			logger.warn("Mqtt publish but topic:{} subscribe client list is empty.", topic);
+			logger.warn("Mqtt Topic:{} publishAll but subscribe client list is empty.", topic);
 			return false;
 		}
 		for (Subscribe subscribe : subscribeList) {
 			String clientId = subscribe.getClientId();
 			ChannelContext context = Tio.getByBsId(getServerConfig(), clientId);
 			if (context == null || context.isClosed) {
-				logger.warn("Mqtt publish to clientId:{} ChannelContext may be disconnected.", clientId);
+				logger.warn("Mqtt Topic:{} publish to clientId:{} channel is null may be disconnected.", topic, clientId);
 				continue;
 			}
 			int subMqttQoS = subscribe.getMqttQoS();
@@ -243,7 +243,7 @@ public final class MqttServer {
 		try {
 			sessionManager.clean();
 		} catch (Throwable e) {
-			logger.error("Mqtt server stop session clean error.", e);
+			logger.error("MqttServer stop session clean error.", e);
 		}
 		this.executor.shutdown();
 		return result;

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/support/DefaultMqttServerProcessor.java

@@ -127,7 +127,7 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 			.sessionPresent(false)
 			.build();
 		Tio.send(context, message);
-		logger.debug("Connect ack send - clientId: {} returnCode:{}", clientId, returnCode);
+		logger.info("Connect ack send - clientId: {} returnCode:{}", clientId, returnCode);
 	}
 
 	@Override
@@ -174,7 +174,7 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 	public void processPubAck(ChannelContext context, MqttMessageIdVariableHeader variableHeader) {
 		int messageId = variableHeader.messageId();
 		String clientId = context.getBsId();
-		logger.debug("PubAck - clientId:{}, messageId: {}", clientId, messageId);
+		logger.debug("PubAck - clientId:{}, messageId:{}", clientId, messageId);
 		MqttPendingPublish pendingPublish = sessionManager.getPendingPublish(clientId, messageId);
 		if (pendingPublish == null) {
 			return;
@@ -188,7 +188,7 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 	public void processPubRec(ChannelContext context, MqttMessageIdVariableHeader variableHeader) {
 		String clientId = context.getBsId();
 		int messageId = variableHeader.messageId();
-		logger.debug("PubRec - clientId:{}, messageId: {}", clientId, messageId);
+		logger.debug("PubRec - clientId:{}, messageId:{}", clientId, messageId);
 		MqttPendingPublish pendingPublish = sessionManager.getPendingPublish(clientId, messageId);
 		if (pendingPublish == null) {
 			return;
@@ -207,7 +207,7 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 	public void processPubRel(ChannelContext context, MqttMessageIdVariableHeader variableHeader) {
 		String clientId = context.getBsId();
 		int messageId = variableHeader.messageId();
-		logger.debug("PubRel - clientId:{}, messageId: {}", clientId, messageId);
+		logger.debug("PubRel - clientId:{}, messageId:{}", clientId, messageId);
 		MqttPendingQos2Publish pendingQos2Publish = sessionManager.getPendingQos2Publish(clientId, messageId);
 		if (pendingQos2Publish != null) {
 			MqttPublishMessage incomingPublish = pendingQos2Publish.getIncomingPublish();
@@ -229,7 +229,7 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 	public void processPubComp(ChannelContext context, MqttMessageIdVariableHeader variableHeader) {
 		int messageId = variableHeader.messageId();
 		String clientId = context.getBsId();
-		logger.debug("PubComp - clientId:{}, messageId: {}", clientId, messageId);
+		logger.debug("PubComp - clientId:{}, messageId:{}", clientId, messageId);
 		MqttPendingPublish pendingPublish = sessionManager.getPendingPublish(clientId, messageId);
 		if (pendingPublish != null) {
 			pendingPublish.getPayload().clear();
@@ -253,8 +253,8 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 			mqttQosList.add(mqttQoS);
 			topicList.add(topicName);
 			sessionManager.addSubscribe(topicName, clientId, mqttQoS);
-			logger.debug("Subscribe - clientId:{} messageId:{} topicFilter:{} mqttQoS:{}", clientId, messageId, topicName, mqttQoS);
 		}
+		logger.info("Subscribe - clientId:{} Topic:{} mqttQoS:{} messageId:{}", clientId, topicList, mqttQosList, messageId);
 		// 3. 返回 ack
 		MqttMessage subAckMessage = MqttMessageBuilders.subAck()
 			.addGrantedQosList(mqttQosList)
@@ -277,8 +277,8 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 		List<String> topicFilterList = message.payload().topics();
 		for (String topicFilter : topicFilterList) {
 			sessionManager.removeSubscribe(topicFilter, clientId);
-			logger.debug("UnSubscribe - clientId:{} messageId:{} topicFilter:{}", clientId, messageId, topicFilter);
 		}
+		logger.info("UnSubscribe - clientId:{} Topic:{} messageId:{}", clientId, topicFilterList, messageId);
 		MqttMessage unSubMessage = MqttMessageBuilders.unsubAck()
 			.packetId(messageId)
 			.build();
@@ -295,7 +295,7 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
 	@Override
 	public void processDisConnect(ChannelContext context) {
 		String clientId = context.getBsId();
-		logger.info("DisConnect - clientId:{}", clientId);
+		logger.info("DisConnect - clientId:{} contextId:{}", clientId, context.getId());
 		// 设置正常断开的标识
 		context.set(MqttConst.DIS_CONNECTED, (byte) 1);
 		Tio.remove(context, "Mqtt DisConnect");