jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix masterlog_level to control master log level control

Browse Source
This commit is contained in:
Theo Arends 2020-07-31 16:56:42 +02:00
parent a5857ac03f
commit 317d4977d1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasmota/support.ino
View File

@ -1784,16 +1784,17 @@ void Syslog(void)
void AddLog(uint32_t loglevel)
{
if ((masterlog_level > 0) && (loglevel < masterlog_level)) { return; }
char mxtime[10]; // "13:45:21 "
snprintf_P(mxtime, sizeof(mxtime), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d "), RtcTime.hour, RtcTime.minute, RtcTime.second);
if (loglevel <= seriallog_level) {
if ((loglevel <= seriallog_level) &&
(masterlog_level <= seriallog_level)) {
Serial.printf("%s%s\r\n", mxtime, log_data);
}
#ifdef USE_WEBSERVER
if (Settings.webserver && (loglevel <= Settings.weblog_level)) {
if (Settings.webserver &&
(loglevel <= Settings.weblog_level) &&
(masterlog_level <= Settings.weblog_level)) {
// Delimited, zero-terminated buffer of log lines.
// Each entry has this format: [index][log data]['\1']
web_log_index &= 0xFF;
@ -1814,10 +1815,12 @@ void AddLog(uint32_t loglevel)
#endif // USE_WEBSERVER
if (Settings.flag.mqtt_enabled && // SetOption3 - Enable MQTT
!global_state.mqtt_down &&
(loglevel <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
(loglevel <= Settings.mqttlog_level) &&
(masterlog_level <= Settings.mqttlog_level)) { MqttPublishLogging(mxtime); }
if (!global_state.network_down &&
(loglevel <= syslog_level)) { Syslog(); }
(loglevel <= syslog_level) &&
(masterlog_level <= syslog_level)) { Syslog(); }
prepped_loglevel = 0;
}