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

persist log_events to config file

Browse Source
This commit is contained in:
Paul
2019-10-06 23:59:12 +02:00
parent f6d9fe9a85
commit 2cd0a76ef8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/MyESP.cpp
View File

@@ -395,7 +395,7 @@ void MyESP::mqttPublish(const char * topic, const char * payload) {
if (packet_id) { if (packet_id) {
_addMQTTLog(topic, payload, 1); // add to the log, using type of 1 for Publish _addMQTTLog(topic, payload, 1); // add to the log, using type of 1 for Publish
} else { } else {
myDebug_P(PSTR("[MQTT] Error publishing to %s with payload %s"), _mqttTopic(topic), payload); myDebug_P(PSTR("[MQTT] Error publishing to %s with payload %s, error %d"), _mqttTopic(topic), payload, packet_id);
} }
} }
@@ -1585,7 +1585,7 @@ bool MyESP::_fs_validateConfigFile(const char * filename, size_t maxsize, JsonDo
// check size // check size
size_t size = file.size(); size_t size = file.size();
myDebug_P(PSTR("[FS] Checking file %s (size %d bytes)"), filename, size); // remove for debugging myDebug_P(PSTR("[FS] Checking file %s (%d bytes)"), filename, size); // remove for debugging
if (size > maxsize) { if (size > maxsize) {
file.close(); file.close();
@@ -1640,11 +1640,11 @@ bool MyESP::_fs_validateLogFile(const char * filename) {
// check sizes // check sizes
size_t size = eventlog.size(); size_t size = eventlog.size();
size_t maxsize = ESP.getFreeHeap() - 2000; // reserve some buffer size_t maxsize = ESP.getFreeHeap() - 2000; // reserve some buffer
myDebug_P(PSTR("[FS] Checking file %s (size %d bytes, max is %d)"), filename, size, maxsize); // remove for debugging myDebug_P(PSTR("[FS] Checking file %s (%d/%d bytes)"), filename, size, maxsize); // remove for debugging
if (size > maxsize) { if (size > maxsize) {
eventlog.close(); eventlog.close();
myDebug_P(PSTR("[FS] File %s size %d is too large (max %d)"), filename, size, maxsize); myDebug_P(PSTR("[FS] File %s size %d is too large"), filename, size);
return false; return false;
} else if (size == 0) { } else if (size == 0) {
eventlog.close(); eventlog.close();
@@ -1756,7 +1756,7 @@ bool MyESP::_fs_loadConfig() {
_general_password = strdup(general["password"] | MYESP_HTTP_PASSWORD); _general_password = strdup(general["password"] | MYESP_HTTP_PASSWORD);
_ws->setAuthentication("admin", _general_password); _ws->setAuthentication("admin", _general_password);
_general_hostname = strdup(general["hostname"]); _general_hostname = strdup(general["hostname"]);
_general_log_events = general["log_events"] | false; // default is off _general_log_events = general["log_events"];
// serial is only on when booting // serial is only on when booting
#ifdef FORCE_SERIAL #ifdef FORCE_SERIAL
@@ -1903,10 +1903,11 @@ bool MyESP::_fs_writeConfig() {
network["password"] = _network_password; network["password"] = _network_password;
network["wmode"] = _network_wmode; network["wmode"] = _network_wmode;
JsonObject general = doc.createNestedObject("general"); JsonObject general = doc.createNestedObject("general");
general["password"] = _general_password; general["password"] = _general_password;
general["serial"] = _general_serial; general["serial"] = _general_serial;
general["hostname"] = _general_hostname; general["hostname"] = _general_hostname;
general["log_events"] = _general_log_events;
JsonObject mqtt = doc.createNestedObject("mqtt"); JsonObject mqtt = doc.createNestedObject("mqtt");
mqtt["enabled"] = _mqtt_enabled; mqtt["enabled"] = _mqtt_enabled;

2
src/MyESP.h
View File

@@ -9,7 +9,7 @@
#ifndef MyESP_h #ifndef MyESP_h
#define MyESP_h #define MyESP_h
#define MYESP_VERSION "1.2.7" #define MYESP_VERSION "1.2.8"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <ArduinoOTA.h> #include <ArduinoOTA.h>