jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #584 from perexg/topic/config-jsondoc-alloc

Browse Source 
use one allocation size for DynamicJsonDocument settings
This commit is contained in:
fvanroie 2023-12-01 20:14:43 +01:00 committed by GitHub
commit 031c35d442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hasp_config.cpp
View File

@ -354,7 +354,7 @@ void configWrite()
settingsChanged = F(D_CONFIG_CHANGED); settingsChanged = F(D_CONFIG_CHANGED);
/* Read Config File */ /* Read Config File */
DynamicJsonDocument doc(8 * 256); DynamicJsonDocument doc(MAX_CONFIG_JSON_ALLOC_SIZE);
LOG_TRACE(TAG_CONF, F(D_FILE_LOADING), configFile.c_str()); LOG_TRACE(TAG_CONF, F(D_FILE_LOADING), configFile.c_str());
configRead(doc, false); configRead(doc, false);
LOG_INFO(TAG_CONF, F(D_FILE_LOADED), configFile.c_str()); LOG_INFO(TAG_CONF, F(D_FILE_LOADED), configFile.c_str());
@ -515,7 +515,7 @@ void configWrite()
void configSetup() void configSetup()
{ {
DynamicJsonDocument settings(1024 + 512); DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
for(uint32_t i = 0; i < 2; i++) { for(uint32_t i = 0; i < 2; i++) {
if(i == 0) { if(i == 0) {

2
src/hasp_config.h
View File

@ -8,6 +8,8 @@
#include "hasplib.h" #include "hasplib.h"
#define MAX_CONFIG_JSON_ALLOC_SIZE (2048)
/* ===== Default Event Processors ===== */ /* ===== Default Event Processors ===== */
void configSetup(void); void configSetup(void);
void configLoop(void); void configLoop(void);

4
src/sys/svc/hasp_http.cpp
View File

@ -561,7 +561,7 @@ static void webHandleApi()
{ // http://plate01/api { // http://plate01/api
if(!http_is_authenticated("api")) return; if(!http_is_authenticated("api")) return;
DynamicJsonDocument doc(2048); DynamicJsonDocument doc(max(MAX_CONFIG_JSON_ALLOC_SIZE, 2048));
String contentType = http_get_content_type(F(".json")); String contentType = http_get_content_type(F(".json"));
String endpoint((char*)0); String endpoint((char*)0);
endpoint = webServer.pathArg(0); endpoint = webServer.pathArg(0);
@ -1109,7 +1109,7 @@ static inline int handleFilesystemFile(String path)
configFile = FPSTR(FP_HASP_CONFIG_FILE); configFile = FPSTR(FP_HASP_CONFIG_FILE);
if(path.endsWith(configFile.c_str())) { // "//config.json" is also a valid path! if(path.endsWith(configFile.c_str())) { // "//config.json" is also a valid path!
DynamicJsonDocument settings(2048); DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
DeserializationError error = configParseFile(configFile, settings); DeserializationError error = configParseFile(configFile, settings);
if(error) return 500; // Internal Server Error if(error) return 500; // Internal Server Error

2
src/sys/svc/hasp_http_async.cpp
View File

@ -934,7 +934,7 @@ int handleFileRead(AsyncWebServerRequest* request, String path)
if(!strncasecmp(file.name(), configFile.c_str(), configFile.length())) { if(!strncasecmp(file.name(), configFile.c_str(), configFile.length())) {
file.close(); file.close();
DynamicJsonDocument settings(8 * 256); DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
DeserializationError error = configParseFile(configFile, settings); DeserializationError error = configParseFile(configFile, settings);
if(error) return 500; // Internal Server Error if(error) return 500; // Internal Server Error