github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-07-10 08:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[esp32] Simplify custom hook forwarding in the Log V2 override

Browse Source
This commit is contained in:
J. Nick Koston
2026-07-01 20:21:02 -05:00
parent f843cc81c6
commit e5e92b1e22
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/log.cpp
+2 -22
View File
@@ -2,7 +2,6 @@
#include "defines.h"
#include "helpers.h"
#include <cstdio>
#include <cstring>
#ifdef USE_LOGGER
#include "esphome/components/logger/logger.h"
@@ -179,27 +178,8 @@ void esp_log_format(esp_log_msg_t *message) {
message->args);
return;
}
// A custom vprintf hook is installed: forward through it, prepending
// "tag: " to preserve which IDF component logged. The tag is a static
// literal with no % specifiers, so concatenating it in front of the format
// leaves the original args aligned. Only do this when the whole thing fits;
// never truncate the format, which could cut a % specifier and misread an
// arg. This path runs with cache enabled (not constrained_env), so
// flash-resident strlen/memcpy are safe here.
const char *tag = message->tag;
if (tag != nullptr) {
size_t tag_len = strlen(tag);
size_t format_len = strlen(message->format);
char buf[256];
if (tag_len + 2 + format_len < sizeof(buf)) { // "tag: " + format + '\0'
memcpy(buf, tag, tag_len);
buf[tag_len] = ':';
buf[tag_len + 1] = ' ';
memcpy(buf + tag_len + 2, message->format, format_len + 1); // include '\0'
esp_log_vprint_func(buf, message->args);
return;
}
}
// A custom hook was installed via esp_log_set_vprintf: honor it and forward
// the message body as-is.
esp_log_vprint_func(message->format, message->args);
}
} // extern "C"