diff --git a/ChangeLog.md b/ChangeLog.md index 7f7867cc..24bfa9b1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,7 @@ * fix for high traffic on KNX integration * add workaround for libssl issues, add debug logging and force it using IPv4 * fix log level potentially set too late during startup +* fix too low timeout for config web service ## Features * add log entry for unstartable TCP ports diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index 3a33e2e5..290fd817 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -912,10 +912,9 @@ int main(int argc, char* argv[], char* envp[]) { } configHttpClient = new HttpClient(); if ( - // check with low timeout of 1 second initially: - !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION, 1) - // if that did not work, issue a single retry with default timeout: - && !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION) + !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION) + // if that did not work, issue a single retry with higher timeout: + && !configHttpClient->connect(configHost, configPort, proto == "https", PACKAGE_NAME "/" PACKAGE_VERSION, 8) ) { logWrite(lf_main, ll_error, "invalid configPath URL (connect)"); // force logging on exit delete configHttpClient; diff --git a/src/lib/ebus/result.cpp b/src/lib/ebus/result.cpp index 9e587d82..5e1a3fa0 100755 --- a/src/lib/ebus/result.cpp +++ b/src/lib/ebus/result.cpp @@ -44,7 +44,7 @@ const char* getResultCode(result_t resultCode) { case RESULT_ERR_DUPLICATE: return "ERR: duplicate entry"; case RESULT_ERR_DUPLICATE_NAME: return "ERR: duplicate name"; 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_ACK: return "ERR: ACK error"; case RESULT_ERR_NAK: return "ERR: NAK received";