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

resolve conditions after reading scan config files

Browse Source
This commit is contained in:
john30
2015-11-01 23:18:06 +01:00
parent 80dc2bdd3c
commit 7b21cacd41
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+9 -3
View File
@@ -755,12 +755,18 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
templates = it->second; templates = it->second;
} }
result = messages->readFromFile(best, templates); result = messages->readFromFile(best, templates);
if (result==RESULT_OK) if (result!=RESULT_OK) {
logNotice(lf_main, "read config file %s for scan %s", best.c_str(), ident.c_str());
else
logError(lf_main, "error reading config file %s for scan %s: %s", best.c_str(), ident.c_str(), getResultCode(result)); logError(lf_main, "error reading config file %s for scan %s: %s", best.c_str(), ident.c_str(), getResultCode(result));
return result; return result;
} }
logNotice(lf_main, "read config file %s for scan %s", best.c_str(), ident.c_str());
result = messages->resolveConditions(false);
if (result != RESULT_OK)
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());
return RESULT_OK;
}
/** /**