nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

higher config web service timeout, formatting

Browse Source
This commit is contained in:
John
2023-06-17 10:25:12 +02:00
parent ea87515ef5
commit cd097b1d2b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.md
+1
View File
@@ -6,6 +6,7 @@
* fix for high traffic on KNX integration * fix for high traffic on KNX integration
* add workaround for libssl issues, add debug logging and force it using IPv4 * add workaround for libssl issues, add debug logging and force it using IPv4
* fix log level potentially set too late during startup * fix log level potentially set too late during startup
* fix too low timeout for config web service
## Features ## Features
* add log entry for unstartable TCP ports * add log entry for unstartable TCP ports
src/ebusd/main.cpp
+3 -4
View File
@@ -912,10 +912,9 @@ int main(int argc, char* argv[], char* envp[]) {
} }
configHttpClient = new HttpClient(); configHttpClient = new HttpClient();
if ( if (
// check with low timeout of 1 second initially: !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION)
!configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION, 1) // if that did not work, issue a single retry with higher timeout:
// if that did not work, issue a single retry with default timeout: && !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION, 8)
&& !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION)
) { ) {
logWrite(lf_main, ll_error, "invalid configPath URL (connect)"); // force logging on exit logWrite(lf_main, ll_error, "invalid configPath URL (connect)"); // force logging on exit
delete configHttpClient; delete configHttpClient;
src/lib/ebus/result.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ const char* getResultCode(result_t resultCode) {
case RESULT_ERR_DUPLICATE: return "ERR: duplicate entry"; case RESULT_ERR_DUPLICATE: return "ERR: duplicate entry";
case RESULT_ERR_DUPLICATE_NAME: return "ERR: duplicate name"; case RESULT_ERR_DUPLICATE_NAME: return "ERR: duplicate name";
case RESULT_ERR_BUS_LOST: return "ERR: arbitration lost"; case RESULT_ERR_BUS_LOST: return "ERR: arbitration lost";
case RESULT_ERR_ARB_RUNNING: return "ERR: arbitration running"; case RESULT_ERR_ARB_RUNNING: return "ERR: arbitration running";
case RESULT_ERR_CRC: return "ERR: CRC error"; case RESULT_ERR_CRC: return "ERR: CRC error";
case RESULT_ERR_ACK: return "ERR: ACK error"; case RESULT_ERR_ACK: return "ERR: ACK error";
case RESULT_ERR_NAK: return "ERR: NAK received"; case RESULT_ERR_NAK: return "ERR: NAK received";