espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-09-25 06:31:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_logging_remove_initiator' into 'master'

Browse Source 
fix(log): Remove initiator function was picking the worg variable for logging

See merge request espressif/esp-mqtt!243
This commit is contained in:
Rocha Euripedes
2025-08-20 21:28:59 +08:00
parent 31ac4fe981 f85e8a925d
commit 804121b721
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mqtt_outbox.c
View File

@@ -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) { if (item == item_to_delete) {
STAILQ_REMOVE(outbox->list, item, outbox_item, next); STAILQ_REMOVE(outbox->list, item, outbox_item, next);
outbox->size -= item->len; 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->buffer);
free(item); free(item);
return ESP_OK; 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) { if (item->msg_id == msg_id && (0xFF & (item->msg_type)) == msg_type) {
STAILQ_REMOVE(outbox->list, item, outbox_item, next); STAILQ_REMOVE(outbox->list, item, outbox_item, next);
outbox->size -= item->len; 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->buffer);
free(item); 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; 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; outbox->size -= item->len;
msg_id = item->msg_id; msg_id = item->msg_id;
free(item); free(item);
ESP_LOGD(TAG, "DELETE_SINGLE_EXPIRED msgid=%d, remain size=%"PRIu64, msg_id, outbox_get_size(outbox));
return msg_id; 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); STAILQ_REMOVE(outbox->list, item, outbox_item, next);
free(item->buffer); free(item->buffer);
outbox->size -= item->len; outbox->size -= item->len;
ESP_LOGD(TAG, "DELETE_EXPIRED msgid=%d, remain size=%"PRIu64, item->msg_id, outbox_get_size(outbox));
free(item); free(item);
deleted_items ++; deleted_items ++;
} }
@@ -207,6 +210,7 @@ void outbox_delete_all_items(outbox_handle_t outbox)
STAILQ_FOREACH_SAFE(item, outbox->list, next, tmp) { STAILQ_FOREACH_SAFE(item, outbox->list, next, tmp) {
STAILQ_REMOVE(outbox->list, item, outbox_item, next); STAILQ_REMOVE(outbox->list, item, outbox_item, next);
outbox->size -= item->len; 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->buffer);
free(item); free(item);
} }

4
mqtt_client.c
View File

@@ -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) 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) { 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; 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; return false;
} }