From 4711ed97aeb045428e9afbc1c826d040a5f880b6 Mon Sep 17 00:00:00 2001 From: Euripedes Rocha Filho Date: Mon, 28 Jul 2025 10:58:23 +0200 Subject: [PATCH 1/2] fix(log): Remove initiator function was picking the worg variable for logging --- mqtt_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mqtt_client.c b/mqtt_client.c index 5c4ba76..54c8e2f 100644 --- a/mqtt_client.c +++ b/mqtt_client.c @@ -1217,11 +1217,11 @@ static esp_err_t deliver_suback(esp_mqtt_client_handle_t client) static bool remove_initiator_message(esp_mqtt_client_handle_t client, int msg_type, int msg_id) { if (outbox_delete(client->outbox, msg_id, msg_type) == ESP_OK) { - ESP_LOGD(TAG, "Removed pending_id=%d", client->mqtt_state.pending_msg_id); + ESP_LOGD(TAG, "Removed pending_id=%d", msg_id); return true; } - ESP_LOGD(TAG, "Failed to remove pending_id=%d", client->mqtt_state.pending_msg_id); + ESP_LOGD(TAG, "Failed to remove pending_id=%d", msg_id); return false; } From f85e8a925d30272989e35e3a7434cfbd21d1cf6a Mon Sep 17 00:00:00 2001 From: Euripedes Rocha Filho Date: Mon, 28 Jul 2025 14:17:02 +0200 Subject: [PATCH 2/2] feat: Add logging to outbox message deletion. --- lib/mqtt_outbox.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/mqtt_outbox.c b/lib/mqtt_outbox.c index ab44e82..6e63b19 100644 --- a/lib/mqtt_outbox.c +++ b/lib/mqtt_outbox.c @@ -96,6 +96,7 @@ esp_err_t outbox_delete_item(outbox_handle_t outbox, outbox_item_handle_t item_t if (item == item_to_delete) { STAILQ_REMOVE(outbox->list, item, outbox_item, next); outbox->size -= item->len; + ESP_LOGD(TAG, "DELETE_ITEM msgid=%d, msg_type=%d, remain size=%"PRIu64, item_to_delete->msg_id, item_to_delete->msg_type, outbox_get_size(outbox)); free(item->buffer); free(item); return ESP_OK; @@ -123,9 +124,9 @@ esp_err_t outbox_delete(outbox_handle_t outbox, int msg_id, int msg_type) if (item->msg_id == msg_id && (0xFF & (item->msg_type)) == msg_type) { STAILQ_REMOVE(outbox->list, item, outbox_item, next); outbox->size -= item->len; + ESP_LOGD(TAG, "DELETE msgid=%d, msg_type=%d, remain size=%"PRIu64, msg_id, msg_type, outbox_get_size(outbox)); free(item->buffer); free(item); - ESP_LOGD(TAG, "DELETED msgid=%d, msg_type=%d, remain size=%"PRIu64, msg_id, msg_type, outbox_get_size(outbox)); return ESP_OK; } @@ -172,6 +173,7 @@ int outbox_delete_single_expired(outbox_handle_t outbox, outbox_tick_t current_t outbox->size -= item->len; msg_id = item->msg_id; free(item); + ESP_LOGD(TAG, "DELETE_SINGLE_EXPIRED msgid=%d, remain size=%"PRIu64, msg_id, outbox_get_size(outbox)); return msg_id; } @@ -188,6 +190,7 @@ int outbox_delete_expired(outbox_handle_t outbox, outbox_tick_t current_tick, ou STAILQ_REMOVE(outbox->list, item, outbox_item, next); free(item->buffer); outbox->size -= item->len; + ESP_LOGD(TAG, "DELETE_EXPIRED msgid=%d, remain size=%"PRIu64, item->msg_id, outbox_get_size(outbox)); free(item); deleted_items ++; } @@ -207,6 +210,7 @@ void outbox_delete_all_items(outbox_handle_t outbox) STAILQ_FOREACH_SAFE(item, outbox->list, next, tmp) { STAILQ_REMOVE(outbox->list, item, outbox_item, next); outbox->size -= item->len; + ESP_LOGD(TAG, "DELETE_ALL_ITEMS msgid=%d, msg_type=%d, remain size=%"PRIu64, item->msg_id, item->msg_type, outbox_get_size(outbox)); free(item->buffer); free(item); }