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

cancel get request if reading a required message fails, continue get request if decoding a messsage fails and add a decodeerror answer

Browse Source
This commit is contained in:
john30
2015-11-28 12:39:10 +01:00
parent 3fa4655a4a
commit 3f022d04d0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+8 -2
View File
@@ -1116,7 +1116,7 @@ string MainLoop::executeGet(vector<string> &args, bool& connected)
// read directly from bus // read directly from bus
SymbolString master(true); SymbolString master(true);
SymbolString slave(false); SymbolString slave(false);
result_t ret = readFromBus(message, master, "", slave); ret = readFromBus(message, master, "", slave);
if (ret == RESULT_OK) { if (ret == RESULT_OK) {
ostringstream temp; ostringstream temp;
ret = message->decode(pt_slaveData, slave, temp); ret = message->decode(pt_slaveData, slave, temp);
@@ -1145,9 +1145,15 @@ string MainLoop::executeGet(vector<string> &args, bool& connected)
result << "\n \"lastup\": " << setw(0) << dec << static_cast<unsigned>(lastup); result << "\n \"lastup\": " << setw(0) << dec << static_cast<unsigned>(lastup);
if (lastup != 0) { if (lastup != 0) {
result << ",\n \"zz\": \"" << setfill('0') << setw(2) << hex << static_cast<unsigned>(dstAddress) << "\""; result << ",\n \"zz\": \"" << setfill('0') << setw(2) << hex << static_cast<unsigned>(dstAddress) << "\"";
size_t pos = result.tellp();
result << ",\n \"fields\": ["; result << ",\n \"fields\": [";
ret = message->decodeLastData(result, (verbose?OF_VERBOSE:0)|(numeric?OF_NUMERIC:0)|OF_JSON); result_t dret = message->decodeLastData(result, (verbose?OF_VERBOSE:0)|(numeric?OF_NUMERIC:0)|OF_JSON);
result << "\n ]"; result << "\n ]";
if (dret!=RESULT_OK) {
string prefix = result.str().substr(0, pos);
result.str(prefix); // remove written fields
result << ",\n \"decodeerror\": \"" << getResultCode(dret) << "\"";
}
} }
result << ",\n \"passive\": " << (message->isPassive() ? "true" : "false"); result << ",\n \"passive\": " << (message->isPassive() ? "true" : "false");
result << ",\n \"write\": " << (message->isWrite() ? "true" : "false"); result << ",\n \"write\": " << (message->isWrite() ? "true" : "false");