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

extensions/ModbusMaster/MBTCPMaster.cc

@@ -112,7 +112,6 @@ std::shared_ptr<ModbusClient> MBTCPMaster::initMB( bool reopen )
             mbtcp->setTimeout(recv_timeout);
 
         mbtcp->setSleepPause(sleepPause_usec);
-
         mbtcp->setAfterSendPause(aftersend_pause);
 
         dinfo << myname << "(init): ipaddr=" << iaddr << " port=" << port << endl;
@@ -123,6 +122,14 @@ std::shared_ptr<ModbusClient> MBTCPMaster::initMB( bool reopen )
     catch( ModbusRTU::mbException& ex )
     {
         dwarn << "(init): " << ex << endl;
+        mb = nullptr;
+        mbtcp = nullptr;
+    }
+    catch( const ost::Exception& e )
+    {
+        dwarn << myname << "(init): Can`t create socket " << iaddr << ":" << port << " err: " << e.getString() << endl;
+        mb = nullptr;
+        mbtcp = nullptr;
     }
     catch(...)
     {

extensions/ModbusMaster/MBTCPMultiMaster.cc

@@ -278,7 +278,7 @@ bool MBTCPMultiMaster::MBSlaveInfo::init()
 {
     try
     {
-        // ost::Thread::setException(ost::Thread::throwException);
+        ost::Thread::setException(ost::Thread::throwException);
 
         dinfo << myname << "(init): connect..." << endl;
 
@@ -288,7 +288,7 @@ bool MBTCPMultiMaster::MBSlaveInfo::init()
         if( recv_timeout > 0 )
             mbtcp->setTimeout(recv_timeout);
 
-//        if( !initOK )
+        // if( !initOK )
         {
             mbtcp->setSleepPause(sleepPause_usec);
             mbtcp->setAfterSendPause(aftersend_pause);
@@ -304,6 +304,10 @@ bool MBTCPMultiMaster::MBSlaveInfo::init()
     {
         dwarn << "(init): " << ex << endl;
     }
+    catch( const ost::Exception& e )
+    {
+        dwarn << myname << "(init): Can`t create socket " << ip << ":" << port << " err: " << e.getString() << endl;
+    }
     catch(...)
     {
         dwarn << "(init): " << myname << " catch ..." << endl;

extensions/ModbusMaster/tests/MBTCPTestServer.cc

@@ -33,7 +33,7 @@ MBTCPTestServer::MBTCPTestServer( ModbusAddr myaddr, const string& inetaddr, int
     ost::InetAddress ia(inetaddr.c_str());
 
     if( verbose )
-        cout << "(init): "
+        cout << "(MBTCPTestServer::init): "
             << " addr: " << ia << ":" << port << endl;
 
     {
@@ -42,9 +42,24 @@ MBTCPTestServer::MBTCPTestServer( ModbusAddr myaddr, const string& inetaddr, int
         myname = s.str();
     }
 
-    sslot = new ModbusTCPServerSlot(ia,port);
-
-//    sslot->initLog(conf,name,logfile);
+    try
+    {
+        ost::Thread::setException(ost::Thread::throwException);
+        sslot = new ModbusTCPServerSlot(ia,port);
+    }
+    catch( const ost::SockException& e )
+    {
+        ostringstream err;
+        err << "(MBTCPTestServer::init): Can`t create socket " << addr << ":" << port << " err: " << e.getString() << endl;
+        cerr << err.str() << endl;
+        throw SystemError(err.str());
+    }
+    catch( const std::exception& ex )
+    {
+        cerr << "(MBTCPTestServer::init): Can`t create socket " << addr << ":" << port << " err: " << ex.what() << endl;
+        throw ex;
+    }
+    //    sslot->initLog(conf,name,logfile);
 
     sslot->connectReadCoil( sigc::mem_fun(this, &MBTCPTestServer::readCoilStatus) );
     sslot->connectReadInputStatus( sigc::mem_fun(this, &MBTCPTestServer::readInputStatus) );

extensions/ModbusMaster/tests/mbmaster-test-configure.xml

@@ -37,8 +37,8 @@
                 <item addr="0x01" invert="1" respondSensor="Slave_Not_Respond_S" timeout="1000"/>
             </DeviceList>
             <GateList>
-                <item ip="127.0.0.1" port="20050" recv_timeout="200" invert="1" respondSensor="Slave1_Not_Respond_S"/>
-                <item ip="127.0.0.1" port="20052" recv_timeout="200" invert="1" respondSensor="Slave2_Not_Respond_S"/>
+                <item ip="127.0.0.1" port="20053" recv_timeout="200" invert="1" respondSensor="Slave1_Not_Respond_S"/>
+                <item ip="127.0.0.1" port="20055" recv_timeout="200" invert="1" respondSensor="Slave2_Not_Respond_S"/>
             </GateList>
         </MBTCPMultiMaster1>
 	</settings>

extensions/ModbusMaster/tests/test_mbtcpmaster.cc

@@ -37,7 +37,22 @@ static void InitTest()
 
     if( !mbs )
     {
-        mbs = make_shared<MBTCPTestServer>(slaveADDR,addr,port,false);
+        try
+        {
+            mbs = make_shared<MBTCPTestServer>(slaveADDR,addr,port,false);
+        }
+        catch( const ost::SockException& e )
+        {
+            ostringstream err;
+            err << "(mbs): Can`t create socket " << addr << ":" << port << " err: " << e.getString() << endl;
+            cerr << err.str() << endl;
+            throw SystemError(err.str());
+        }
+        catch( const std::exception& ex )
+        {
+            cerr << "(mbs): Can`t create socket " << addr << ":" << port << " err: " << ex.what() << endl;
+            throw ex;
+        }
         //mbs->setVerbose(true);
         CHECK( mbs!= nullptr );
         mbs->runThread();

extensions/ModbusMaster/tests/test_mbtcpmultimaster.cc

@@ -21,9 +21,9 @@ using namespace std;
 using namespace UniSetTypes;
 // -----------------------------------------------------------------------------
 static ModbusRTU::ModbusAddr slaveaddr = 0x01; // conf->getArgInt("--mbs-my-addr");
-static int port = 20050; // conf->getArgInt("--mbs-inet-port");
+static int port = 20053; // conf->getArgInt("--mbs-inet-port");
 static string addr("127.0.0.1"); // conf->getArgParam("--mbs-inet-addr");
-static int port2 = 20052;
+static int port2 = 20055;
 static string addr2("127.0.0.1");
 static ModbusRTU::ModbusAddr slaveADDR = 0x01;
 static shared_ptr<MBTCPTestServer> mbs1;
@@ -52,7 +52,23 @@ static void InitTest()
 
     if( !mbs1 )
     {
-        mbs1 = make_shared<MBTCPTestServer>(slaveADDR,addr,port,false);
+        try
+        {
+            ost::Thread::setException(ost::Thread::throwException);
+            mbs1 = make_shared<MBTCPTestServer>(slaveADDR,addr,port,false);
+        }
+        catch( const ost::SockException& e )
+        {
+            ostringstream err;
+            err << "(mb1): Can`t create socket " << addr << ":" << port << " err: " << e.getString() << endl;
+            cerr << err.str() << endl;
+            throw SystemError(err.str());
+        }
+        catch( const std::exception& ex )
+        {
+            cerr << "(mb1): Can`t create socket " << addr << ":" << port << " err: " << ex.what() << endl;
+            throw ex;
+        }
         CHECK( mbs1!= nullptr );
         mbs1->setReply(0);
         mbs1->runThread();
@@ -65,7 +81,23 @@ static void InitTest()
 
     if( !mbs2 )
     {
-        mbs2 = make_shared<MBTCPTestServer>(slaveADDR,addr2,port2,false);
+        try
+        {
+            ost::Thread::setException(ost::Thread::throwException);
+            mbs2 = make_shared<MBTCPTestServer>(slaveADDR,addr2,port2,false);
+        }
+        catch( const ost::SockException& e )
+        {
+            ostringstream err;
+            err << "(mb2): Can`t create socket " << addr << ":" << port << " err: " << e.getString() << endl;
+            cerr << err.str() << endl;
+            throw SystemError(err.str());
+        }
+        catch( const std::exception& ex )
+        {
+            cerr << "(mb2): Can`t create socket " << addr << ":" << port << " err: " << ex.what() << endl;
+            throw ex;
+        }
         CHECK( mbs2!= nullptr );
         mbs2->setReply(0);
         mbs2->runThread();