This commit is contained in:
J. Nick Koston
2026-02-04 06:37:07 +01:00
parent 9758b15508
commit d2e9e8ebd6
2 changed files with 13 additions and 5 deletions
+1 -5
View File
@@ -129,11 +129,7 @@ void Logger::log_vprintf_(uint8_t level, const char *tag, int line, const __Flas
if (level > this->level_for(tag) || global_recursion_guard_)
return;
RecursionGuard guard(global_recursion_guard_);
LogBuffer buf(this->tx_buffer_, this->tx_buffer_at_, this->tx_buffer_size_);
this->format_log_to_buffer_with_terminator_P_(level, tag, line, format, args, buf);
this->notify_listeners_(level, tag);
this->write_log_buffer_to_console_(buf);
this->log_message_to_buffer_and_send_P_(global_recursion_guard_, level, tag, line, format, args);
}
#endif // USE_STORE_LOG_STR_IN_FLASH
+12
View File
@@ -475,6 +475,18 @@ class Logger : public Component {
this->write_log_buffer_to_console_(buf);
}
#ifdef USE_STORE_LOG_STR_IN_FLASH
// Helper to format and send a log message with flash format string (ESP8266)
inline void HOT log_message_to_buffer_and_send_P_(bool &recursion_guard, uint8_t level, const char *tag, int line,
const __FlashStringHelper *format, va_list args) {
RecursionGuard guard(recursion_guard);
LogBuffer buf(this->tx_buffer_, this->tx_buffer_at_, this->tx_buffer_size_);
this->format_log_to_buffer_with_terminator_P_(level, tag, line, format, args, buf);
this->notify_listeners_(level, tag);
this->write_log_buffer_to_console_(buf);
}
#endif
#ifdef USE_ESPHOME_TASK_LOG_BUFFER
// Helper to format a pre-formatted message from the task log buffer and notify listeners
// Used by process_messages_ to avoid code duplication between ESP32 and host platforms