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
2648d598
Commit
2648d598
authored
Nov 13, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Немного подправил логи
parent
e309f9ec
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
ObjectRepository.cc
src/ObjectRepository/ObjectRepository.cc
+1
-1
ProxyManager.cc
src/ObjectRepository/ProxyManager.cc
+1
-1
UniSetObject.cc
src/ObjectRepository/UniSetObject.cc
+2
-2
IOController.cc
src/Processes/IOController.cc
+1
-1
NCRestorer_XML.cc
src/Processes/NCRestorer_XML.cc
+1
-1
No files found.
src/ObjectRepository/ObjectRepository.cc
View file @
2648d598
...
...
@@ -88,7 +88,7 @@ throw(ORepFailed, ObjectNameAlready, InvalidObjectName, NameNotFound)
{
ostringstream
err
;
u
info
<<
"ObjectRepository(registration): регистрируем "
<<
name
<<
endl
;
u
logrep
<<
"ObjectRepository(registration): регистрируем "
<<
name
<<
endl
;
if
(
CORBA
::
is_nil
(
oRef
)
)
{
...
...
src/ObjectRepository/ProxyManager.cc
View file @
2648d598
...
...
@@ -81,7 +81,7 @@ bool ProxyManager::activateObject()
{
try
{
u
info
<<
myname
<<
"(registered): попытка "
u
logrep
<<
myname
<<
"(registered): попытка "
<<
i
+
1
<<
" регистриую (id="
<<
it
.
first
<<
") "
<<
" (pname="
<<
it
.
second
->
getName
()
<<
") "
<<
uniset_conf
()
->
oind
->
getNameById
(
it
.
first
)
<<
endl
;
...
...
src/ObjectRepository/UniSetObject.cc
View file @
2648d598
...
...
@@ -225,11 +225,11 @@ VoidMessagePtr UniSetObject::waitMessage( timeout_t timeMS )
// ------------------------------------------------------------------------------------------
void
UniSetObject
::
registered
()
{
u
info
<<
myname
<<
": registration..."
<<
endl
;
u
logrep
<<
myname
<<
": registration..."
<<
endl
;
if
(
myid
==
uniset
::
DefaultObjectId
)
{
uinfo
<<
myname
<<
"(registered): myid=DefaultObjectId
\n
"
;
uinfo
<<
myname
<<
"(registered):
Don`t registration.
myid=DefaultObjectId
\n
"
;
return
;
}
...
...
src/Processes/IOController.cc
View file @
2648d598
...
...
@@ -409,7 +409,7 @@ void IOController::ioRegistration( std::shared_ptr<USensorInfo>& usi, bool force
{
try
{
u
info
<<
myname
u
logrep
<<
myname
<<
"(ioRegistration): регистрирую "
<<
uniset_conf
()
->
oind
->
getNameById
(
usi
->
si
.
id
)
<<
endl
;
...
...
src/Processes/NCRestorer_XML.cc
View file @
2648d598
...
...
@@ -392,7 +392,7 @@ void NCRestorer_XML::read_thresholds( const std::shared_ptr<UniXML>& xml, xmlNod
for
(
;
tit
;
tit
.
goNext
()
)
{
IONotifyController
::
ThresholdInfoExt
ti
(
0
,
0
,
0
,
0
);
IONotifyController
::
ThresholdInfoExt
ti
(
0
,
0
,
0
,
false
);
if
(
!
getThresholdInfo
(
xml
,
tit
,
ti
)
)
{
...
...
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