Skip to content

U
uniset2
Commit cd44e338 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(ModbusTCPMaster): добавил вылавливание исключений при выводе лога

parent 28497847
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
src/Communications/Modbus/ModbusTCPMaster.cc
View file @ cd44e338
...@@ -202,6 +202,8 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg, ...@@ -202,6 +202,8 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
{ {
const char* err = tcp->getErrorString(); const char* err = tcp->getErrorString();
try
{
dlog->warn() << "(ModbusTCPMaster::query): ret=" << (int)ret dlog->warn() << "(ModbusTCPMaster::query): ret=" << (int)ret
<< " < rmh=" << (int)sizeof(rmh) << " < rmh=" << (int)sizeof(rmh)
<< " errnum: " << tcp->getErrorNumber() << " errnum: " << tcp->getErrorNumber()
...@@ -209,6 +211,12 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg, ...@@ -209,6 +211,12 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
<< " err: " << (err ? string(err) : "") << " err: " << (err ? string(err) : "")
<< endl; << endl;
} }
catch( const ost::SockException& e )
{
if( dlog->is_warn() )
dlog->warn() << "(query): tcp error: " << e.getString() << endl;
}
}
tcp->forceDisconnect(); tcp->forceDisconnect();
return erTimeOut; // return erHardwareError; return erTimeOut; // return erHardwareError;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment