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
412646b0
Commit
412646b0
authored
Sep 27, 2016
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(admin): подправил логи..
(codegen): подправил вывод информации о LogServer-е
parent
1ac2fe0b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
6 deletions
+34
-6
admin.cc
Utilities/Admin/admin.cc
+24
-3
ctl-cpp-common.xsl
Utilities/codegen/ctl-cpp-common.xsl
+8
-1
TestProc.cc
extensions/tests/SMemoryTest/TestProc.cc
+2
-2
No files found.
Utilities/Admin/admin.cc
View file @
412646b0
...
@@ -60,6 +60,7 @@ string conffile("configure.xml");
...
@@ -60,6 +60,7 @@ string conffile("configure.xml");
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
static
bool
commandToAll
(
const
string
&
section
,
std
::
shared_ptr
<
ObjectRepository
>&
rep
,
Command
cmd
);
static
bool
commandToAll
(
const
string
&
section
,
std
::
shared_ptr
<
ObjectRepository
>&
rep
,
Command
cmd
);
static
void
createSections
(
const
std
::
shared_ptr
<
Configuration
>&
c
);
static
void
createSections
(
const
std
::
shared_ptr
<
Configuration
>&
c
);
static
void
errDoNotReolve
(
const
std
::
string
&
oname
);
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
int
omap
();
int
omap
();
int
configure
(
const
string
&
args
,
UInterface
&
ui
);
int
configure
(
const
string
&
args
,
UInterface
&
ui
);
...
@@ -418,7 +419,11 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
...
@@ -418,7 +419,11 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
{
{
case
StartUp
:
case
StartUp
:
{
{
if
(
CORBA
::
is_nil
(
obj
))
break
;
if
(
CORBA
::
is_nil
(
obj
)
)
{
errDoNotReolve
(
ob
);
break
;
}
SystemMessage
msg
(
SystemMessage
::
StartUp
);
SystemMessage
msg
(
SystemMessage
::
StartUp
);
obj
->
push
(
Message
::
transport
(
msg
)
);
obj
->
push
(
Message
::
transport
(
msg
)
);
...
@@ -430,7 +435,11 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
...
@@ -430,7 +435,11 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
case
FoldUp
:
case
FoldUp
:
{
{
if
(
CORBA
::
is_nil
(
obj
))
break
;
if
(
CORBA
::
is_nil
(
obj
))
{
errDoNotReolve
(
ob
);
break
;
}
SystemMessage
msg
(
SystemMessage
::
FoldUp
);
SystemMessage
msg
(
SystemMessage
::
FoldUp
);
obj
->
push
(
Message
::
transport
(
msg
)
);
obj
->
push
(
Message
::
transport
(
msg
)
);
...
@@ -442,7 +451,11 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
...
@@ -442,7 +451,11 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
case
Finish
:
case
Finish
:
{
{
if
(
CORBA
::
is_nil
(
obj
))
break
;
if
(
CORBA
::
is_nil
(
obj
))
{
errDoNotReolve
(
ob
);
break
;
}
SystemMessage
msg
(
SystemMessage
::
Finish
);
SystemMessage
msg
(
SystemMessage
::
Finish
);
obj
->
push
(
Message
::
transport
(
msg
)
);
obj
->
push
(
Message
::
transport
(
msg
)
);
...
@@ -511,6 +524,9 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
...
@@ -511,6 +524,9 @@ static bool commandToAll(const string& section, std::shared_ptr<ObjectRepository
}
}
catch
(
ORepFailed
)
catch
(
ORepFailed
)
{
{
if
(
!
quiet
)
cerr
<<
"..ORepFailed.."
<<
endl
;
cout
.
setf
(
old_flags
);
cout
.
setf
(
old_flags
);
return
false
;
return
false
;
}
}
...
@@ -1010,3 +1026,8 @@ int oinfo( const string& args, UInterface& ui, int userparam )
...
@@ -1010,3 +1026,8 @@ int oinfo( const string& args, UInterface& ui, int userparam )
}
}
// --------------------------------------------------------------------------------------
// --------------------------------------------------------------------------------------
void
errDoNotReolve
(
const
std
::
string
&
oname
)
{
if
(
verb
)
cerr
<<
oname
<<
": resolve failed.."
<<
endl
;
}
Utilities/codegen/ctl-cpp-common.xsl
View file @
412646b0
...
@@ -493,9 +493,16 @@ UniSetTypes::SimpleInfo* <xsl:value-of select="$CLASSNAME"/>_SK::getInfo( CORBA:
...
@@ -493,9 +493,16 @@ UniSetTypes::SimpleInfo* <xsl:value-of select="$CLASSNAME"/>_SK::getInfo( CORBA:
ostringstream inf;
ostringstream inf;
inf
<<
i->info
<<
endl;
inf
<<
i->info
<<
endl;
inf
<<
"LogServer: "
<<
logserv_host
<<
":"
<<
logserv_port
<<
endl;
if( logserv /*
&&
userparam
<
0 */ )
if( logserv /*
&&
userparam
<
0 */ )
{
inf
<<
"LogServer: "
<<
logserv_host
<<
":"
<<
logserv_port
<<
( logserv->isRunning() ? " [RUNNIG]" : " [FAILED]" )
<<
endl;
inf
<<
" "
<<
logserv->getShortInfo()
<<
endl;
inf
<<
" "
<<
logserv->getShortInfo()
<<
endl;
}
else
inf
<<
"LogServer: NONE"
<<
endl;
inf
<<
dumpIO()
<<
endl;
inf
<<
dumpIO()
<<
endl;
inf
<<
endl;
inf
<<
endl;
auto timers = getTimersList();
auto timers = getTimersList();
...
...
extensions/tests/SMemoryTest/TestProc.cc
View file @
412646b0
...
@@ -53,8 +53,8 @@ void TestProc::sysCommand( const UniSetTypes::SystemMessage* sm )
...
@@ -53,8 +53,8 @@ void TestProc::sysCommand( const UniSetTypes::SystemMessage* sm )
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
string
TestProc
::
getMonitInfo
()
string
TestProc
::
getMonitInfo
()
{
{
int
*
p
=
0
;
//
int* p = 0;
(
*
p
)
=
10
;
//
(*p) = 10;
return
""
;
return
""
;
}
}
...
...
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