* MDF [broker_mqtt] modify logging output

Signed-off-by: jaylin <jaylin@emqx.io>
nanomq · Dec 25, 2024 · a74c625 · a74c625
1 parent b9ef005
commit a74c625
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/mqtt/protocol/mqtt/mqtt_client.c b/src/mqtt/protocol/mqtt/mqtt_client.c
@@ -662,7 +662,7 @@ mqtt_timer_cb(void *arg)
 		nni_pipe_send(p->pipe, &p->send_aio);
 		p->pingcnt ++;
 		nni_mtx_unlock(&s->mtx);
-		log_info("Send pingreq (sock%p)(%dms)", s, s->keepalive);
+		log_debug("Send pingreq (sock%p)(%dms)", s, s->keepalive);
 		nni_sleep_aio(s->retry, &p->time_aio);
 		return;
 	}

diff --git a/src/sp/protocol/mqtt/mqtt_parser.c b/src/sp/protocol/mqtt/mqtt_parser.c
@@ -263,6 +263,7 @@ copyn_utf8_str(const uint8_t *src, uint32_t *pos, int *str_len, int limit)
 				return NULL;
 			}
 		} else {
+			log_warn("UTF-8 check failed!");
 			*str_len = -1;
 		}
 	}
@@ -1648,7 +1649,7 @@ int
 nmq_subinfo_decode(nng_msg *msg, void *l, uint8_t ver)
 {
 	char           *topic;
-	uint8_t         *payload_ptr, len_of_varint = 0, *var_ptr;
+	uint8_t        *payload_ptr, len_of_varint = 0, *var_ptr;
 	uint32_t        num = 0, len = 0, len_of_str = 0, subid = 0;
 	uint16_t        len_of_topic = 0;
 	size_t          bpos = 0, remain = 0;
@@ -1674,7 +1675,8 @@ nmq_subinfo_decode(nng_msg *msg, void *l, uint8_t ver)
 		return -2;
 	}
 
-	log_trace("prop len %d varint %d remain %d", len, len_of_varint, nni_msg_remaining_len(msg));
+	log_trace("prop len %d varint %d remain %d", len, len_of_varint,
+			  nni_msg_remaining_len(msg));
 	payload_ptr = (uint8_t *) nni_msg_body(msg) + 2 + len + len_of_varint;
 
 	size_t pos = 2 + len_of_varint, target_pos = 2 + len_of_varint + len;

diff --git a/src/sp/protocol/mqtt/nmq_mqtt.c b/src/sp/protocol/mqtt/nmq_mqtt.c
@@ -1145,6 +1145,7 @@ nano_pipe_recv_cb(void *arg)
 		// Store Subid RAP Topic for sub
 		nni_mtx_lock(&p->lk);
 		rv = nmq_subinfo_decode(msg, npipe->subinfol, cparam->pro_ver);
+		log_debug("Processing subinfo done");
 		if (rv < 0) {
 			log_error("Invalid subscribe packet!");
 			nni_msg_free(msg);

diff --git a/src/sp/transport/mqtt/broker_tcp.c b/src/sp/transport/mqtt/broker_tcp.c
@@ -873,8 +873,6 @@ tcptran_pipe_recv_cb(void *arg)
 		if (nmq_unsubinfo_decode(msg, p->npipe->subinfol,
 								  p->tcp_cparam->pro_ver) < 0) {
 			log_error("Invalid unsubscribe packet!");
-			// nni_msg_free(msg);
-			// conn_param_free(cparam);
 			rv = PROTOCOL_ERROR;
 			goto recv_error;
 		}

diff --git a/src/sp/transport/mqtts/broker_tls.c b/src/sp/transport/mqtts/broker_tls.c
@@ -848,12 +848,11 @@ tlstran_pipe_recv_cb(void *arg)
 		if (nmq_unsubinfo_decode(msg, p->npipe->subinfol,
 								  p->tcp_cparam->pro_ver) < 0) {
 			log_error("Invalid unsubscribe packet!");
-			// nni_msg_free(msg);
-			// conn_param_free(cparam);
 			rv = PROTOCOL_ERROR;
 			goto recv_error;
 		}
 	}
+
 	if (ack == true) {
 		// alloc a msg here costs memory. However we must do it for the
 		// sake of compatibility with nng.