userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly trimming long log messages

Browse Source
This commit is contained in:
Bogdan Pilyugin 2024-02-21 14:15:40 +02:00
parent d7d38b1524
commit 62ce254d47
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/MQTT.c
View File

@ -162,8 +162,6 @@ esp_err_t ExternalServiceMQTTSend(char *servname, char *data, int len, int idx)
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
#define MAX_ERROR_JSON 256 #define MAX_ERROR_JSON 256
mqtt_app_err_t PublicTestMQTT(int idx) mqtt_app_err_t PublicTestMQTT(int idx)
{ {
@ -218,7 +216,7 @@ static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_bas
ComposeTopic(topic, idx, SERVICE_NAME, DOWNLINK_SUBTOPIC); ComposeTopic(topic, idx, SERVICE_NAME, DOWNLINK_SUBTOPIC);
msg_id = esp_mqtt_client_subscribe(client, (char*) topic, 0); msg_id = esp_mqtt_client_subscribe(client, (char*) topic, 0);
#if MQTT_DEBUG_MODE > 0 #if MQTT_DEBUG_MODE > 0
ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id); ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
ESP_LOGI(TAG, "Subscribe to %s", topic); ESP_LOGI(TAG, "Subscribe to %s", topic);
#endif #endif
#ifdef CONFIG_WEBGUIAPP_UART_TRANSPORT_ENABLE #ifdef CONFIG_WEBGUIAPP_UART_TRANSPORT_ENABLE
@ -508,13 +506,19 @@ static void mqtt2_user_event_handler(void *handler_args, esp_event_base_t base,
#define MAX_MQTT_LOG_MESSAGE (1024) #define MAX_MQTT_LOG_MESSAGE (1024)
#define SPIRAL_LOG_TAG "SystemExtendedLog" #define SPIRAL_LOG_TAG "SystemExtendedLog"
char data[MAX_MQTT_LOG_MESSAGE]; //char data[MAX_MQTT_LOG_MESSAGE];
esp_err_t ExtendedLog(esp_log_level_t level, char *format, ...) esp_err_t ExtendedLog(esp_log_level_t level, char *format, ...)
{ {
va_list arg; va_list arg;
va_start(arg, format); va_start(arg, format);
va_end(arg); va_end(arg);
char *data = (char*) malloc(MAX_MQTT_LOG_MESSAGE);
if (data == NULL)
return ESP_ERR_NO_MEM;
vsnprintf(data, MAX_MQTT_LOG_MESSAGE, format, arg); vsnprintf(data, MAX_MQTT_LOG_MESSAGE, format, arg);
if(strlen(data) == MAX_MQTT_LOG_MESSAGE - 1)
for(int i = 0; i < 3; i++)
*(data + MAX_MQTT_LOG_MESSAGE - 2 - i) = '.';
switch (level) switch (level)
{ {
case ESP_LOG_INFO: case ESP_LOG_INFO:
@ -551,8 +555,10 @@ esp_err_t ExtendedLog(esp_log_level_t level, char *format, ...)
free(buf); free(buf);
continue; continue;
} }
free(data);
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
free(data);
return ESP_OK; return ESP_OK;
} }