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

be more verbose when decoding failed in read or write command

Browse Source
This commit is contained in:
john30
2015-11-14 16:34:53 +01:00
parent 9d098164c7
commit 1885ab9eda
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+9 -5
View File
@@ -522,8 +522,10 @@ string MainLoop::executeRead(vector<string> &args)
result << message->getCircuit() << " " << message->getName() << " ";
ret = message->decode(pt_slaveData, slave, result, (verbose?OF_VERBOSE:0)|(numeric?OF_NUMERIC:0), false, fieldIndex==-2 ? NULL : fieldName.c_str(), fieldIndex);
if (ret < RESULT_OK) {
logError(lf_main, "read %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
return getResultCode(ret);
logError(lf_main, "read %s %s: decode %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
result.str("");
result << getResultCode(ret) << " in decode";
return result.str();
}
if (ret > RESULT_OK)
return getResultCode(ret);
@@ -628,12 +630,14 @@ string MainLoop::executeWrite(vector<string> &args)
ret = message->decode(pt_slaveData, slave, result); // decode data
if (ret >= RESULT_OK && result.str().empty()) {
logInfo(lf_main, "write %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
logInfo(lf_main, "write %s %s: decode %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
return getResultCode(RESULT_OK);
}
if (ret != RESULT_OK) {
logError(lf_main, "write %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
return getResultCode(ret);
logError(lf_main, "write %s %s: decode %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
result.str("");
result << getResultCode(ret) << " in decode";
return result.str();
}
logInfo(lf_main, "write %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), result.str().c_str());
return result.str();