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

allow subclasses to use m_lastError

Browse Source
This commit is contained in:
john30
2015-10-18 10:17:43 +02:00
parent 6199b34693
commit 5ac7ff3d6d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+2 -3
View File
@@ -534,10 +534,9 @@ result_t loadConfigFiles(DataFieldTemplates* templates, MessageMap* messages, bo
else else
logError(lf_main, "error reading config files: %s, %s", getResultCode(result), messages->getLastError().c_str()); logError(lf_main, "error reading config files: %s, %s", getResultCode(result), messages->getLastError().c_str());
string error; result = messages->resolveConditions(verbose);
result = messages->resolveConditions(error, verbose);
if (result != RESULT_OK) if (result != RESULT_OK)
logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), error.c_str()); logError(lf_main, "error resolving conditions: %s, %s", getResultCode(result), messages->getLastError().c_str());
logNotice(lf_main, "found messages: %d (%d conditional on %d conditions, %d poll, %d update)", messages->size(), messages->sizeConditional(), messages->sizeConditions(), messages->sizePoll(), messages->sizePassive()); logNotice(lf_main, "found messages: %d (%d conditional on %d conditions, %d poll, %d update)", messages->size(), messages->sizeConditional(), messages->sizeConditions(), messages->sizePoll(), messages->sizePassive());