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

even nicer logging

Browse Source
This commit is contained in:
john30
2014-12-13 17:52:54 +01:00
parent 1f116aada7
commit 1378b4c1e4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/baseloop.cpp
+2 -2
View File
@@ -266,7 +266,7 @@ string BaseLoop::decodeMessage(const string& data)
result << getResultCode(ret);
break;
}
L.log(bas, event, "read cmd: %s", master.getDataStr().c_str());
L.log(bas, trace, "read cmd: %s", master.getDataStr().c_str());
// send message
SymbolString slave;
@@ -305,7 +305,7 @@ string BaseLoop::decodeMessage(const string& data)
result << getResultCode(ret);
break;
}
L.log(bas, event, "write cmd: %s", master.getDataStr().c_str());
L.log(bas, trace, "write cmd: %s", master.getDataStr().c_str());
// send message
SymbolString slave;
src/ebusd/bushandler.cpp
+6 -6
View File
@@ -64,7 +64,7 @@ result_t PollRequest::prepare(unsigned char ownMasterAddress)
istringstream input;
result_t result = m_message->prepareMaster(ownMasterAddress, m_master, input);
if (result == RESULT_OK)
L.log(bus, event, "poll cmd: %s", m_master.getDataStr().c_str());
L.log(bus, trace, "poll cmd: %s", m_master.getDataStr().c_str());
return result;
}
@@ -86,7 +86,7 @@ result_t ScanRequest::prepare(unsigned char ownMasterAddress, unsigned char dstA
istringstream input;
result_t result = m_message->prepareMaster(ownMasterAddress, m_master, input, UI_FIELD_SEPARATOR, dstAddress);
if (result == RESULT_OK)
L.log(bus, event, "scan cmd: %s", m_master.getDataStr().c_str());
L.log(bus, trace, "scan cmd: %s", m_master.getDataStr().c_str());
return result;
}
@@ -96,10 +96,10 @@ void ScanRequest::notify(result_t result)
m_scanResult << hex << setw(2) << setfill('0') << static_cast<unsigned>(m_master[1]) << UI_FIELD_SEPARATOR;
result = m_message->decode(pt_slaveData, m_slave, m_scanResult); // decode data
}
if (result == RESULT_OK)
L.log(bus, event, "scan result: %s", m_scanResult.str().c_str());
else
if (result != RESULT_OK)
L.log(bus, error, "scan %2.2x failed: %s", m_master[1], getResultCode(result));
else
L.log(bus, event, "scan: %s", m_scanResult.str().c_str());
}
@@ -141,7 +141,7 @@ bool ActiveBusRequest::wait(int timeout)
void ActiveBusRequest::notify(result_t result)
{
if (result == RESULT_OK)
L.log(bus, trace, "read res: %s", m_slave.getDataStr().c_str());
L.log(bus, event, "read res: %s", m_slave.getDataStr().c_str());
pthread_mutex_lock(&m_mutex);