Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
f66ca1fe
Commit
f66ca1fe
authored
Dec 14, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(SM): сделал чтобы SM вылетала, если не удалось загрузить датчики (readDump)
parent
c006bede
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
libuniset2.spec
conf/libuniset2.spec
+4
-1
IOController.cc
src/Processes/IOController.cc
+1
-0
IONotifyController.cc
src/Processes/IONotifyController.cc
+6
-1
No files found.
conf/libuniset2.spec
View file @
f66ca1fe
...
...
@@ -16,7 +16,7 @@
Name: libuniset2
Version: 2.6
Release: alt
7
Release: alt
8
Summary: UniSet - library for building distributed industrial control systems
License: LGPL
...
...
@@ -507,6 +507,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# history of current unpublished changes
%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
- Modbus: refactoring code and test (for 64bit)
- iobase: refactoring tests for 64bit
...
...
src/Processes/IOController.cc
View file @
f66ca1fe
...
...
@@ -119,6 +119,7 @@ void IOController::activateInit()
catch
(
const
uniset
::
Exception
&
ex
)
{
ucrit
<<
myname
<<
"(activateInit): "
<<
ex
<<
endl
;
std
::
terminate
();
}
}
}
...
...
src/Processes/IONotifyController.cc
View file @
f66ca1fe
...
...
@@ -598,7 +598,12 @@ void IONotifyController::readDump()
}
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();
}
}
// --------------------------------------------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment