optimize memory usage for config data, allow 4s timeout for setConfig

This commit is contained in:
andreas 2022-03-11 14:50:48 +01:00
parent 6741222574
commit 4557e6c0bb
6 changed files with 40 additions and 17 deletions

View File

@ -66,13 +66,10 @@ bool GwConfigHandler::loadConfig(){
bool GwConfigHandler::saveConfig(){ bool GwConfigHandler::saveConfig(){
prefs.begin(PREF_NAME,false); prefs.begin(PREF_NAME,false);
for (int i=0;i<getNumConfig();i++){ for (int i=0;i<getNumConfig();i++){
String val=configs[i]->asString(); if (configs[i]->hasChangedValue){
auto it=changedValues.find(configs[i]->getName()); LOG_DEBUG(GwLog::LOG,"saving %s=%s",configs[i]->getName().c_str(),configs[i]->changedValue.c_str());
if (it != changedValues.end()){ prefs.putString(configs[i]->getName().c_str(),configs[i]->changedValue);
val=it->second;
} }
LOG_DEBUG(GwLog::LOG,"saving %s=%s",configs[i]->getName().c_str(),val.c_str());
prefs.putString(configs[i]->getName().c_str(),val);
} }
prefs.end(); prefs.end();
LOG_DEBUG(GwLog::LOG,"saved config"); LOG_DEBUG(GwLog::LOG,"saved config");
@ -87,14 +84,14 @@ bool GwConfigHandler::updateValue(String name, String value){
} }
else{ else{
LOG_DEBUG(GwLog::LOG,"update config %s=>%s",name.c_str(),i->isSecret()?"***":value.c_str()); LOG_DEBUG(GwLog::LOG,"update config %s=>%s",name.c_str(),i->isSecret()?"***":value.c_str());
changedValues[name]=value; i->updateValue(value);
} }
return true; return true;
} }
bool GwConfigHandler::reset(bool save){ bool GwConfigHandler::reset(bool save){
LOG_DEBUG(GwLog::LOG,"reset config"); LOG_DEBUG(GwLog::LOG,"reset config");
for (int i=0;i<getNumConfig();i++){ for (int i=0;i<getNumConfig();i++){
changedValues[configs[i]->getName()]=configs[i]->getDefault(); configs[i]->updateValue(configs[i]->getDefault(),true);
} }
if (!save) return true; if (!save) return true;
return saveConfig(); return saveConfig();

View File

@ -13,7 +13,6 @@ class GwConfigHandler: public GwConfigDefinitions{
Preferences prefs; Preferences prefs;
GwLog *logger; GwLog *logger;
typedef std::map<String,String> StringMap; typedef std::map<String,String> StringMap;
StringMap changedValues;
boolean allowChanges=true; boolean allowChanges=true;
public: public:
public: public:

View File

@ -7,11 +7,28 @@ class GwConfigHandler;
class GwConfigInterface{ class GwConfigInterface{
private: private:
String name; String name;
String initialValue; const char * initialValue;
String value; String value;
bool secret=false; bool secret=false;
String changedValue;
bool hasChangedValue=false;
void updateValue(String value,bool cmpDefault=false){
hasChangedValue=false;
if (cmpDefault){
if (value != initialValue) {
changedValue=value;
hasChangedValue=true;
}
}
else{
if (value != this->value) {
changedValue=value;
hasChangedValue=true;
}
}
}
public: public:
GwConfigInterface(const String &name, const String initialValue, bool secret=false){ GwConfigInterface(const String &name, const char * initialValue, bool secret=false){
this->name=name; this->name=name;
this->initialValue=initialValue; this->initialValue=initialValue;
this->value=initialValue; this->value=initialValue;

View File

@ -56,6 +56,7 @@ class GwRequestMessage : public GwMessage{
String getContentType(){ String getContentType(){
return contentType; return contentType;
} }
virtual int getTimeout(){return 500;}
}; };

View File

@ -68,7 +68,7 @@ GwWebServer::~GwWebServer(){
} }
void GwWebServer::handleAsyncWebRequest(AsyncWebServerRequest *request, GwRequestMessage *msg) void GwWebServer::handleAsyncWebRequest(AsyncWebServerRequest *request, GwRequestMessage *msg)
{ {
GwRequestQueue::MessageSendStatus st=queue->sendAndWait(msg,500); GwRequestQueue::MessageSendStatus st=queue->sendAndWait(msg,msg->getTimeout());
if (st == GwRequestQueue::MSG_ERR) if (st == GwRequestQueue::MSG_ERR)
{ {
msg->unref(); //our msg->unref(); //our

View File

@ -460,7 +460,7 @@ class SetConfigRequest : public GwRequestMessage
public: public:
SetConfigRequest() : GwRequestMessage(F("application/json"),F("setConfig")){}; SetConfigRequest() : GwRequestMessage(F("application/json"),F("setConfig")){};
StringMap args; StringMap args;
virtual int getTimeout(){return 4000;}
protected: protected:
virtual void processRequest() virtual void processRequest()
{ {
@ -475,6 +475,10 @@ protected:
result=JSON_INVALID_PASS; result=JSON_INVALID_PASS;
return; return;
} }
logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
(long)xPortGetFreeHeapSize(),
(long)xPortGetMinimumEverFreeHeapSize()
);
for (StringMap::iterator it = args.begin(); it != args.end(); it++) for (StringMap::iterator it = args.begin(); it != args.end(); it++)
{ {
if (it->first.indexOf("_")>= 0) continue; if (it->first.indexOf("_")>= 0) continue;
@ -489,12 +493,19 @@ protected:
error += it->second; error += it->second;
error += ","; error += ",";
} }
logger.flush();
} }
if (ok) if (ok)
{ {
result = JSON_OK; result = JSON_OK;
logger.logDebug(GwLog::ERROR,"update config and restart"); logger.logDebug(GwLog::ERROR,"update config and restart");
config.saveConfig(); config.saveConfig();
logger.flush();
logger.logDebug(GwLog::DEBUG,"Heap free=%ld, minFree=%ld",
(long)xPortGetFreeHeapSize(),
(long)xPortGetMinimumEverFreeHeapSize()
);
logger.flush();
delayedRestart(); delayedRestart();
} }
else else
@ -632,13 +643,11 @@ void setup() {
webserver.registerMainHandler("/api/setConfig", webserver.registerMainHandler("/api/setConfig",
[](AsyncWebServerRequest *request)->GwRequestMessage * [](AsyncWebServerRequest *request)->GwRequestMessage *
{ {
StringMap args; SetConfigRequest *msg = new SetConfigRequest();
for (int i = 0; i < request->args(); i++) for (int i = 0; i < request->args(); i++)
{ {
args[request->argName(i)] = request->arg(i); msg->args[request->argName(i)] = request->arg(i);
} }
SetConfigRequest *msg = new SetConfigRequest();
msg->args = args;
return msg; return msg;
}); });
webserver.registerMainHandler("/api/resetConfig", [](AsyncWebServerRequest *request)->GwRequestMessage * webserver.registerMainHandler("/api/resetConfig", [](AsyncWebServerRequest *request)->GwRequestMessage *