mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13866 from s-hadinger/berry_limit_logs 

Berry limit size of log
This commit is contained in:
s-hadinger 2021-11-29 23:31:17 +01:00 committed by GitHub
parent 25241e52c2 46b7347689
commit 730a8cbc4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/xdrv_52_3_berry_tasmota.ino
View File

@ -24,6 +24,7 @@
#include <Wire.h> #include <Wire.h>
const uint32_t BERRY_MAX_LOGS = 16; // max number of print output recorded when outside of REPL, used to avoid infinite grow of logs const uint32_t BERRY_MAX_LOGS = 16; // max number of print output recorded when outside of REPL, used to avoid infinite grow of logs
const uint32_t BERRY_MAX_REPL_LOGS = 1024; // max number of print output recorded when inside REPL
/*********************************************************************************************\ /*********************************************************************************************\
* Return C callback from index * Return C callback from index
@ -575,16 +576,13 @@ extern "C" {
void berry_log(const char * berry_buf); void berry_log(const char * berry_buf);
void berry_log(const char * berry_buf) { void berry_log(const char * berry_buf) {
const char * pre_delimiter = nullptr; // do we need to prepend a delimiter if no REPL command const char * pre_delimiter = nullptr; // do we need to prepend a delimiter if no REPL command
if (!berry.repl_active) { size_t max_logs = berry.repl_active ? BERRY_MAX_REPL_LOGS : BERRY_MAX_LOGS;
// if no REPL in flight, we limit the number of logs
if (berry.log.log.length() == 0) { if (berry.log.log.length() == 0) {
pre_delimiter = BERRY_CONSOLE_CMD_DELIMITER; pre_delimiter = BERRY_CONSOLE_CMD_DELIMITER;
} }
if (berry.log.log.length() >= BERRY_MAX_LOGS) { if (berry.log.log.length() >= BERRY_MAX_LOGS) {
berry.log.log.remove(berry.log.log.head()); berry.log.log.remove(berry.log.log.head());
} }
}
// AddLog(LOG_LEVEL_INFO, PSTR("[Add to log] %s"), berry_buf);
berry.log.addString(berry_buf, pre_delimiter, "\n"); berry.log.addString(berry_buf, pre_delimiter, "\n");
AddLog(LOG_LEVEL_INFO, PSTR("%s"), berry_buf); AddLog(LOG_LEVEL_INFO, PSTR("%s"), berry_buf);
} }