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

be verbose when checking scan config

Browse Source
This commit is contained in:
john30
2016-01-10 13:10:02 +01:00
parent 0ea7efc192
commit 2cfdeff084
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+3 -3
View File
@@ -796,7 +796,7 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
} }
// found the right file. load the templates if necessary, then load the file itself // found the right file. load the templates if necessary, then load the file itself
bool readCommon = readTemplates(path, ".csv", hasTemplates, false); bool readCommon = readTemplates(path, ".csv", hasTemplates, opt.checkConfig);
if (readCommon) { if (readCommon) {
result = collectConfigFiles(path, "", ".csv", files); result = collectConfigFiles(path, "", ".csv", files);
if (result==RESULT_OK && !files.empty()) { if (result==RESULT_OK && !files.empty()) {
@@ -807,7 +807,7 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
continue; continue;
if (name.length()<3 || name.find_first_of('.')!=2) { // different from the scheme "ZZ." if (name.length()<3 || name.find_first_of('.')!=2) { // different from the scheme "ZZ."
name = *it; name = *it;
result = messages->readFromFile(name); result = messages->readFromFile(name, opt.checkConfig);
if (result==RESULT_OK) if (result==RESULT_OK)
logNotice(lf_main, "read common config file %s", name.c_str()); logNotice(lf_main, "read common config file %s", name.c_str());
else else
@@ -816,7 +816,7 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
} }
} }
} }
result = messages->readFromFile(best); result = messages->readFromFile(best, opt.checkConfig);
if (result!=RESULT_OK) { if (result!=RESULT_OK) {
logError(lf_main, "error reading scan config file %s for ID \"%s\", SW%s, HW%s: %s", best.c_str(), ident.c_str(), sw.c_str(), hw.c_str(), getResultCode(result)); logError(lf_main, "error reading scan config file %s for ID \"%s\", SW%s, HW%s: %s", best.c_str(), ident.c_str(), sw.c_str(), hw.c_str(), getResultCode(result));
return result; return result;