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
62468123
Commit
62468123
authored
May 28, 2017
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Configuration): исправил ошибку в функции проверки доступности endPoint.
parent
c318e1bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
libuniset2.spec
conf/libuniset2.spec
+4
-1
Configuration.dox
docs/DocPages/Configuration.dox
+3
-0
Configuration.cc
src/Various/Configuration.cc
+6
-2
No files found.
conf/libuniset2.spec
View file @
62468123
...
...
@@ -16,7 +16,7 @@
Name: libuniset2
Version: 2.6
Release: alt
19
Release: alt
20
Summary: UniSet - library for building distributed industrial control systems
License: LGPL
...
...
@@ -508,6 +508,9 @@ rm -f %buildroot%_libdir/*.la
# history of current unpublished changes
%changelog
* Sun May 28 2017 Pavel Vainerman <pv@altlinux.ru> 2.6-alt20
- (Configuration): fixed bug in check endPoint function
* Thu May 25 2017 Pavel Vainerman <pv@altlinux.ru> 2.6-alt19
- MBSlave: Now does not terminate when socket is not open
- Configuration: Now does not terminate when endPoint is not available
...
...
docs/DocPages/Configuration.dox
View file @
62468123
...
...
@@ -54,5 +54,7 @@ int main(int argc, char **argv)
Для параметра 'endPoint' встроена дополнительная проверка доступности указанной адреса.
\warning По умолчанию \b недоступность \b игнорируется, если не указан параметр \a error_if_not_available="1"
Помимо этого можно задать параметр \a ignore_checking="1", чтобы не происходило проверки доступности endPoint.
*/
\ No newline at end of file
src/Various/Configuration.cc
View file @
62468123
...
...
@@ -335,7 +335,7 @@ namespace uniset
if
(
p
==
"endPoint"
)
{
const
string
param
(
omniIt
.
getProp
(
"arg"
));
bool
endPointIsAvailable
=
checkOmniORBendPoint
(
param
)
;
bool
endPointIsAvailable
=
omniIt
.
getProp
(
"ignore_checking"
).
empty
()
?
checkOmniORBendPoint
(
param
)
:
true
;
// по умолчанию "недоступность" игнорируется
// но если указан параметр 'error_if_not_available'
...
...
@@ -701,7 +701,7 @@ namespace uniset
bool
ret
=
false
;
try
{
bool
ret
=
ep
->
Bind
();
ret
=
ep
->
Bind
();
if
(
ret
)
ep
->
Shutdown
();
}
...
...
@@ -711,6 +711,10 @@ namespace uniset
ret
=
false
;
}
ulogsys
<<
"(Configuration::checkOmniORBendPoint): check "
<<
endPoint
<<
" "
<<
(
ret
?
"OK"
:
"FAILED"
)
<<
endl
;
return
ret
;
}
// -------------------------------------------------------------------------
...
...
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