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

add condition comment to loaded file logging, quotes

Browse Source
This commit is contained in:
john30
2016-12-04 16:20:16 +01:00
parent 6e2b293067
commit 14fd6c9a13
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+4 -3
View File
@@ -1460,10 +1460,10 @@ result_t LoadInstruction::execute(MessageMap* messages, ostringstream& log, Cond
log << ", "; log << ", ";
} }
if (result!=RESULT_OK) { if (result!=RESULT_OK) {
log << "error " << (isSingleton() ? "loading " : "including ") << m_filename << " for \"" << getDestination() << "\": " << getResultCode(result); log << "error " << (isSingleton() ? "loading \"" : "including \"") << m_filename << "\" for \"" << getDestination() << "\": " << getResultCode(result);
return result; return result;
} }
log << (isSingleton() ? "loaded " : "included ") << m_filename << " for \"" << getDestination() << "\""; log << (isSingleton() ? "loaded \"" : "included \"") << m_filename << "\" for \"" << getDestination() << "\"";
if (isSingleton() && !m_defaultDest.empty()) { if (isSingleton() && !m_defaultDest.empty()) {
result_t temp; result_t temp;
unsigned char address = (unsigned char)parseInt(m_defaultDest.c_str(), 16, 0, 0xff, temp); unsigned char address = (unsigned char)parseInt(m_defaultDest.c_str(), 16, 0, 0xff, temp);
@@ -1480,6 +1480,7 @@ result_t LoadInstruction::execute(MessageMap* messages, ostringstream& log, Cond
ostringstream out; ostringstream out;
condition->dump(out); condition->dump(out);
comment = out.str(); comment = out.str();
log << " ("+comment+")";
} }
messages->addLoadedFile(address, filename, comment); messages->addLoadedFile(address, filename, comment);
} }
@@ -1829,7 +1830,7 @@ void MessageMap::addLoadedFile(unsigned char address, string file, string commen
if (m_loadedFiles.find(address)==m_loadedFiles.end()) { if (m_loadedFiles.find(address)==m_loadedFiles.end()) {
m_loadedFiles[address] = fileComment; m_loadedFiles[address] = fileComment;
} else { } else {
m_loadedFiles[address] += fileComment; m_loadedFiles[address] += ", "+fileComment;
} }
} }
} }