andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix limit weblog buffer

Browse Source
This commit is contained in:
MichaelDvP
2022-12-24 09:54:05 +01:00
parent fdde118af1
commit 1f1feed3ae
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/web/WebLogService.cpp
View File

@@ -54,6 +54,7 @@ void WebLogService::begin() {
void WebLogService::start() { void WebLogService::start() {
EMSESP::webSettingsService.read([&](WebSettings & settings) { EMSESP::webSettingsService.read([&](WebSettings & settings) {
maximum_log_messages_ = settings.weblog_buffer; maximum_log_messages_ = settings.weblog_buffer;
limit_log_messages_ = maximum_log_messages_;
compact_ = settings.weblog_compact; compact_ = settings.weblog_compact;
uuid::log::Logger::register_handler(this, (uuid::log::Level)settings.weblog_level); uuid::log::Logger::register_handler(this, (uuid::log::Level)settings.weblog_level);
}); });
@@ -78,10 +79,10 @@ size_t WebLogService::maximum_log_messages() const {
} }
void WebLogService::maximum_log_messages(size_t count) { void WebLogService::maximum_log_messages(size_t count) {
if (count > maximum_log_messages_ && ESP.getMaxAllocHeap() < 41984) {
return;
}
maximum_log_messages_ = std::max((size_t)1, count); maximum_log_messages_ = std::max((size_t)1, count);
if (limit_log_messages_ > maximum_log_messages_) {
limit_log_messages_ = maximum_log_messages_;
}
while (log_messages_.size() > maximum_log_messages_) { while (log_messages_.size() > maximum_log_messages_) {
log_messages_.pop_front(); log_messages_.pop_front();
} }
@@ -114,12 +115,14 @@ WebLogService::QueuedLogMessage::QueuedLogMessage(unsigned long id, std::shared_
void WebLogService::operator<<(std::shared_ptr<uuid::log::Message> message) { void WebLogService::operator<<(std::shared_ptr<uuid::log::Message> message) {
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
if (maximum_log_messages_ > 10 && ESP.getMaxAllocHeap() < 41984) { size_t maxAlloc = ESP.getMaxAllocHeap();
maximum_log_messages(maximum_log_messages_ > 25 ? maximum_log_messages_ - 25 : 10); if (limit_log_messages_ > 5 && maxAlloc < 446080) {
// EMSESP::logger().warning("Low memory: WebLog buffer reduced to %d entries", maximum_log_messages_); --limit_log_messages_;
} else if (limit_log_messages_ < maximum_log_messages_ && maxAlloc > 51200) {
++limit_log_messages_;
} }
#endif #endif
if (log_messages_.size() >= maximum_log_messages_) { while (log_messages_.size() >= limit_log_messages_) {
log_messages_.pop_front(); log_messages_.pop_front();
} }

1
src/web/WebLogService.h
View File

@@ -70,6 +70,7 @@ class WebLogService : public uuid::log::Handler {
uint64_t last_transmit_ = 0; // Last transmit time uint64_t last_transmit_ = 0; // Last transmit time
size_t maximum_log_messages_ = MAX_LOG_MESSAGES; // Maximum number of log messages to buffer before they are output size_t maximum_log_messages_ = MAX_LOG_MESSAGES; // Maximum number of log messages to buffer before they are output
size_t limit_log_messages_ = MAX_LOG_MESSAGES; // dynamic limit
unsigned long log_message_id_ = 0; // The next identifier to use for queued log messages unsigned long log_message_id_ = 0; // The next identifier to use for queued log messages
unsigned long log_message_id_tail_ = 0; // last event shown on the screen after fetch unsigned long log_message_id_tail_ = 0; // last event shown on the screen after fetch
std::deque<QueuedLogMessage> log_messages_; // Queued log messages, in the order they were received std::deque<QueuedLogMessage> log_messages_; // Queued log messages, in the order they were received