Commit f66ca1fe authored by Pavel Vainerman's avatar Pavel Vainerman

(SM): сделал чтобы SM вылетала, если не удалось загрузить датчики (readDump)

parent c006bede
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.6 Version: 2.6
Release: alt7 Release: alt8
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: LGPL License: LGPL
...@@ -507,6 +507,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname ...@@ -507,6 +507,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# history of current unpublished changes # history of current unpublished changes
%changelog %changelog
* Wed Dec 14 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt8
- SM: terminate if read dump (configuration) failed
* Tue Dec 13 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt7 * Tue Dec 13 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt7
- Modbus: refactoring code and test (for 64bit) - Modbus: refactoring code and test (for 64bit)
- iobase: refactoring tests for 64bit - iobase: refactoring tests for 64bit
......
...@@ -119,6 +119,7 @@ void IOController::activateInit() ...@@ -119,6 +119,7 @@ void IOController::activateInit()
catch( const uniset::Exception& ex ) catch( const uniset::Exception& ex )
{ {
ucrit << myname << "(activateInit): " << ex << endl; ucrit << myname << "(activateInit): " << ex << endl;
std::terminate();
} }
} }
} }
......
...@@ -598,7 +598,12 @@ void IONotifyController::readDump() ...@@ -598,7 +598,12 @@ void IONotifyController::readDump()
} }
catch( const std::exception& ex ) catch( const std::exception& ex )
{ {
uwarn << myname << "(IONotifyController::readDump): " << ex.what() << endl; // Если дамп не удалось считать, значит что-то не то в configure.xml
// и безопаснее "вылететь", чем запустится, но половина датчиков работать не будет
// как ожидается.
ucrit << myname << "(IONotifyController::readDump): " << ex.what() << endl;
std::terminate(); // std::abort();
} }
} }
// -------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------
......
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