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

include instruction log in error message

Browse Source
This commit is contained in:
john30
2016-03-26 11:06:41 +01:00
parent d203f8c285
commit cff5dd2952
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+2 -2
View File
@@ -671,7 +671,7 @@ result_t loadConfigFiles(MessageMap* messages, bool verbose, bool denyRecursive)
ostringstream log; ostringstream log;
result = messages->executeInstructions(verbose, log); result = messages->executeInstructions(verbose, log);
if (result != RESULT_OK) if (result != RESULT_OK)
logError(lf_main, "error executing instructions: %s, %s", getResultCode(result), messages->getLastError().c_str()); logError(lf_main, "error executing instructions: %s, %s, %s", getResultCode(result), messages->getLastError().c_str(), log.str().c_str());
else if (log.tellp() > 0) else if (log.tellp() > 0)
logNotice(lf_main, log.str().c_str()); logNotice(lf_main, log.str().c_str());
@@ -847,7 +847,7 @@ result_t loadScanConfigFile(MessageMap* messages, unsigned char address, SymbolS
ostringstream log; ostringstream log;
result = messages->executeInstructions(false, log); result = messages->executeInstructions(false, log);
if (result != RESULT_OK) if (result != RESULT_OK)
logError(lf_main, "error executing instructions: %s, %s", getResultCode(result), messages->getLastError().c_str()); logError(lf_main, "error executing instructions: %s, %s, %s", getResultCode(result), messages->getLastError().c_str(), log.str().c_str());
else if (log.tellp() > 0) else if (log.tellp() > 0)
logNotice(lf_main, log.str().c_str()); logNotice(lf_main, log.str().c_str());