github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-20 11:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweak

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-04 06:38:33 +01:00
parent d2e9e8ebd6
commit 7f17b90fb9
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/logger/logger.cpp
+1 -1
View File
@@ -129,7 +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;
this->log_message_to_buffer_and_send_P_(global_recursion_guard_, level, tag, line, format, args);
this->log_message_to_buffer_and_send_(global_recursion_guard_, level, tag, line, format, args);
}
#endif // USE_STORE_LOG_STR_IN_FLASH
esphome/components/logger/logger.h
+9 -14
View File
@@ -2,6 +2,7 @@
#include <cstdarg>
#include <map>
#include <type_traits>
#if defined(USE_ESP32) || defined(USE_HOST)
#include <pthread.h>
#endif
@@ -466,27 +467,21 @@ class Logger : public Component {
}
// Helper to format and send a log message to both console and listeners
// Template handles both const char* (RAM) and __FlashStringHelper* (flash) format strings
template<typename FormatType>
inline void HOT log_message_to_buffer_and_send_(bool &recursion_guard, uint8_t level, const char *tag, int line,
const char *format, va_list args) {
FormatType 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_(level, tag, line, format, args, buf);
if constexpr (std::is_same_v<FormatType, const char *>) {
this->format_log_to_buffer_with_terminator_(level, tag, line, format, args, buf);
} else {
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);
}
#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