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
63977bf7
Commit
63977bf7
authored
Sep 15, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use logFile with string, without c_str
parent
c5dd48ca
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
31 additions
and
31 deletions
+31
-31
IOControl.cc
extensions/IOControl/IOControl.cc
+2
-2
iocontrol.cc
extensions/IOControl/iocontrol.cc
+2
-2
PassiveLProcessor.cc
extensions/LogicProcessor/PassiveLProcessor.cc
+2
-2
logicproc.cc
extensions/LogicProcessor/logicproc.cc
+2
-2
main.cc
extensions/MBTCPMaster/main.cc
+2
-2
MBSlave.cc
extensions/ModbusSlave/MBSlave.cc
+2
-2
mbslave.cc
extensions/ModbusSlave/mbslave.cc
+2
-2
RTUExchange.cc
extensions/RTUExchange/RTUExchange.cc
+2
-2
rtuexchange.cc
extensions/RTUExchange/rtuexchange.cc
+2
-2
smemory.cc
extensions/SharedMemory/smemory.cc
+2
-2
smemory-plus.cc
extensions/SharedMemoryPlus/smemory-plus.cc
+1
-1
UDPExchange.cc
extensions/UDPExchange/UDPExchange.cc
+2
-2
udpexchange.cc
extensions/UDPExchange/udpexchange.cc
+2
-2
uninet.cc
extensions/UniNetwork/uninet.cc
+2
-2
ModbusClient.cc
src/Communications/Modbus/ModbusClient.cc
+1
-1
ModbusServer.cc
src/Communications/Modbus/ModbusServer.cc
+1
-1
Configuration.cc
src/Various/Configuration.cc
+1
-1
DebugStream.cc
src/Various/DebugStream.cc
+1
-1
No files found.
extensions/IOControl/IOControl.cc
View file @
63977bf7
...
...
@@ -1163,7 +1163,7 @@ void IOControl::sysCommand( SystemMessage* sm )
string
fname
=
unideb
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
unideb
.
logFile
(
fname
.
c_str
()
);
unideb
.
logFile
(
fname
);
unideb
<<
myname
<<
"(sysCommand): ***************** UNIDEB LOG ROTATE *****************"
<<
endl
;
}
...
...
@@ -1171,7 +1171,7 @@ void IOControl::sysCommand( SystemMessage* sm )
fname
=
unideb
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
unideb
.
logFile
(
fname
.
c_str
()
);
unideb
.
logFile
(
fname
);
unideb
<<
myname
<<
"(sysCommand): ***************** GGDEB LOG ROTATE *****************"
<<
endl
;
}
}
...
...
extensions/IOControl/iocontrol.cc
View file @
63977bf7
...
...
@@ -29,8 +29,8 @@ int main(int argc, const char **argv)
conf
->
initDebug
(
dlog
,
"dlog"
);
string
logfilename
=
conf
->
getArgParam
(
"--io-logfile"
,
"iocontrol.log"
);
string
logname
(
conf
->
getLogDir
()
+
logfilename
);
dlog
.
logFile
(
logname
.
c_str
()
);
unideb
.
logFile
(
logname
.
c_str
()
);
dlog
.
logFile
(
logname
);
unideb
.
logFile
(
logname
);
ObjectId
shmID
=
DefaultObjectId
;
string
sID
=
conf
->
getArgParam
(
"--smemory-id"
);
...
...
extensions/LogicProcessor/PassiveLProcessor.cc
View file @
63977bf7
...
...
@@ -126,7 +126,7 @@ void PassiveLProcessor::sysCommand( UniSetTypes::SystemMessage *sm )
string
fname
=
unideb
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
unideb
.
logFile
(
fname
.
c_str
()
);
unideb
.
logFile
(
fname
);
unideb
<<
myname
<<
"(sysCommand): ***************** UNIDEB LOG ROTATE *****************"
<<
std
::
endl
;
}
...
...
@@ -134,7 +134,7 @@ void PassiveLProcessor::sysCommand( UniSetTypes::SystemMessage *sm )
fname
=
dlog
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
dlog
.
logFile
(
fname
.
c_str
()
);
dlog
.
logFile
(
fname
);
dlog
<<
myname
<<
"(sysCommand): ***************** dlog LOG ROTATE *****************"
<<
std
::
endl
;
}
}
...
...
extensions/LogicProcessor/logicproc.cc
View file @
63977bf7
...
...
@@ -23,8 +23,8 @@ int main(int argc, const char **argv)
std
::
ostringstream
logname
;
string
dir
(
conf
->
getLogDir
());
logname
<<
dir
<<
logfilename
;
unideb
.
logFile
(
logname
.
str
()
.
c_str
()
);
dlog
.
logFile
(
logname
.
str
()
.
c_str
()
);
unideb
.
logFile
(
logname
.
str
()
);
dlog
.
logFile
(
logname
.
str
()
);
string
schema
=
conf
->
getArgParam
(
"--schema"
);
if
(
schema
.
empty
()
)
...
...
extensions/MBTCPMaster/main.cc
View file @
63977bf7
...
...
@@ -37,8 +37,8 @@ int main( int argc, const char** argv )
std
::
ostringstream
logname
;
string
dir
(
conf
->
getLogDir
());
logname
<<
dir
<<
logfilename
;
unideb
.
logFile
(
logname
.
str
()
.
c_str
()
);
dlog
.
logFile
(
logname
.
str
()
.
c_str
()
);
unideb
.
logFile
(
logname
.
str
()
);
dlog
.
logFile
(
logname
.
str
()
);
ObjectId
shmID
=
DefaultObjectId
;
string
sID
=
conf
->
getArgParam
(
"--smemory-id"
);
...
...
extensions/ModbusSlave/MBSlave.cc
View file @
63977bf7
...
...
@@ -491,7 +491,7 @@ void MBSlave::sysCommand(UniSetTypes::SystemMessage *sm)
string
fname
=
unideb
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
unideb
.
logFile
(
fname
.
c_str
()
);
unideb
.
logFile
(
fname
);
unideb
<<
myname
<<
"(sysCommand): ***************** UNIDEB LOG ROTATE *****************"
<<
std
::
endl
;
}
...
...
@@ -499,7 +499,7 @@ void MBSlave::sysCommand(UniSetTypes::SystemMessage *sm)
fname
=
dlog
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
dlog
.
logFile
(
fname
.
c_str
()
);
dlog
.
logFile
(
fname
);
dlog
<<
myname
<<
"(sysCommand): ***************** dlog LOG ROTATE *****************"
<<
std
::
endl
;
}
}
...
...
extensions/ModbusSlave/mbslave.cc
View file @
63977bf7
...
...
@@ -40,8 +40,8 @@ int main(int argc, const char **argv)
std
::
ostringstream
logname
;
string
dir
(
conf
->
getLogDir
());
logname
<<
dir
<<
logfilename
;
unideb
.
logFile
(
logname
.
str
()
.
c_str
()
);
dlog
.
logFile
(
logname
.
str
()
.
c_str
()
);
unideb
.
logFile
(
logname
.
str
()
);
dlog
.
logFile
(
logname
.
str
()
);
conf
->
initDebug
(
dlog
,
"dlog"
);
...
...
extensions/RTUExchange/RTUExchange.cc
View file @
63977bf7
...
...
@@ -730,14 +730,14 @@ void RTUExchange::sysCommand( UniSetTypes::SystemMessage *sm )
string
fname
=
unideb
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
unideb
.
logFile
(
fname
.
c_str
()
);
unideb
.
logFile
(
fname
);
unideb
<<
myname
<<
"(sysCommand): ***************** UNIDEB LOG ROTATE *****************"
<<
std
::
endl
;
}
dlog
<<
myname
<<
"(sysCommand): logRotate"
<<
std
::
endl
;
fname
=
dlog
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
dlog
.
logFile
(
fname
.
c_str
()
);
dlog
.
logFile
(
fname
);
dlog
<<
myname
<<
"(sysCommand): ***************** dlog LOG ROTATE *****************"
<<
std
::
endl
;
}
}
...
...
extensions/RTUExchange/rtuexchange.cc
View file @
63977bf7
...
...
@@ -35,8 +35,8 @@ int main( int argc, char** argv )
std
::
ostringstream
logname
;
string
dir
(
conf
->
getLogDir
());
logname
<<
dir
<<
logfilename
;
unideb
.
logFile
(
logname
.
str
()
.
c_str
()
);
dlog
.
logFile
(
logname
.
str
()
.
c_str
()
);
unideb
.
logFile
(
logname
.
str
()
);
dlog
.
logFile
(
logname
.
str
()
);
ObjectId
shmID
=
DefaultObjectId
;
string
sID
=
conf
->
getArgParam
(
"--smemory-id"
);
...
...
extensions/SharedMemory/smemory.cc
View file @
63977bf7
...
...
@@ -28,8 +28,8 @@ int main(int argc, const char **argv)
conf
->
initDebug
(
dlog
,
"dlog"
);
string
logfilename
=
conf
->
getArgParam
(
"--logfile"
,
"smemory.log"
);
string
logname
(
conf
->
getLogDir
()
+
logfilename
);
unideb
.
logFile
(
logname
.
c_str
()
);
dlog
.
logFile
(
logname
.
c_str
()
);
unideb
.
logFile
(
logname
);
dlog
.
logFile
(
logname
);
SharedMemory
*
shm
=
SharedMemory
::
init_smemory
(
argc
,
argv
);
if
(
!
shm
)
...
...
extensions/SharedMemoryPlus/smemory-plus.cc
View file @
63977bf7
...
...
@@ -35,7 +35,7 @@ int main( int argc, char **argv )
string
logfilename
=
conf
->
getArgParam
(
"--logfile"
,
"smemory-plus.log"
);
string
logname
(
conf
->
getLogDir
()
+
logfilename
);
unideb
.
logFile
(
logname
.
c_str
()
);
unideb
.
logFile
(
logname
);
ObjectsActivator
act
;
...
...
extensions/UDPExchange/UDPExchange.cc
View file @
63977bf7
...
...
@@ -403,7 +403,7 @@ void UDPExchange::sysCommand(UniSetTypes::SystemMessage *sm)
string
fname
=
unideb
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
unideb
.
logFile
(
fname
.
c_str
()
);
unideb
.
logFile
(
fname
);
unideb
<<
myname
<<
"(sysCommand): ***************** UNIDEB LOG ROTATE *****************"
<<
std
::
endl
;
}
...
...
@@ -411,7 +411,7 @@ void UDPExchange::sysCommand(UniSetTypes::SystemMessage *sm)
fname
=
dlog
.
getLogFile
();
if
(
!
fname
.
empty
()
)
{
dlog
.
logFile
(
fname
.
c_str
()
);
dlog
.
logFile
(
fname
);
dlog
<<
myname
<<
"(sysCommand): ***************** dlog LOG ROTATE *****************"
<<
std
::
endl
;
}
}
...
...
extensions/UDPExchange/udpexchange.cc
View file @
63977bf7
...
...
@@ -35,8 +35,8 @@ int main( int argc, char** argv )
std
::
ostringstream
logname
;
string
dir
(
conf
->
getLogDir
());
logname
<<
dir
<<
logfilename
;
unideb
.
logFile
(
logname
.
str
()
.
c_str
()
);
dlog
.
logFile
(
logname
.
str
()
.
c_str
()
);
unideb
.
logFile
(
logname
.
str
()
);
dlog
.
logFile
(
logname
.
str
()
);
ObjectId
shmID
=
DefaultObjectId
;
string
sID
=
conf
->
getArgParam
(
"--smemory-id"
);
...
...
extensions/UniNetwork/uninet.cc
View file @
63977bf7
...
...
@@ -25,8 +25,8 @@ int main(int argc, const char **argv)
conf
->
initDebug
(
dlog
,
"dlog"
);
string
logfilename
=
conf
->
getArgParam
(
"--logfile"
,
"smemory.log"
);
string
logname
(
conf
->
getLogDir
()
+
logfilename
);
unideb
.
logFile
(
logname
.
c_str
()
);
dlog
.
logFile
(
logname
.
c_str
()
);
unideb
.
logFile
(
logname
);
dlog
.
logFile
(
logname
);
ObjectId
shmID
=
DefaultObjectId
;
string
sID
=
conf
->
getArgParam
(
"--smemory-id"
);
...
...
src/Communications/Modbus/ModbusClient.cc
View file @
63977bf7
...
...
@@ -1014,7 +1014,7 @@ void ModbusClient::initLog( UniSetTypes::Configuration* conf,
conf
->
initDebug
(
dlog
,
lname
);
if
(
!
logfile
.
empty
()
)
dlog
.
logFile
(
logfile
.
c_str
()
);
dlog
.
logFile
(
logfile
);
}
// -------------------------------------------------------------------------
void
ModbusClient
::
setLog
(
DebugStream
&
l
)
...
...
src/Communications/Modbus/ModbusServer.cc
View file @
63977bf7
...
...
@@ -1103,7 +1103,7 @@ void ModbusServer::initLog( UniSetTypes::Configuration* conf,
conf
->
initDebug
(
dlog
,
lname
);
if
(
!
logfile
.
empty
()
)
dlog
.
logFile
(
logfile
.
c_str
()
);
dlog
.
logFile
(
logfile
);
}
// -------------------------------------------------------------------------
void
ModbusServer
::
printProcessingTime
()
...
...
src/Various/Configuration.cc
View file @
63977bf7
...
...
@@ -791,7 +791,7 @@ xmlNode* Configuration::initDebug( DebugStream& deb, const string& _debname )
string
debug_file
(
getProp
(
dnode
,
"file"
));
if
(
!
debug_file
.
empty
()
)
deb
.
logFile
(
debug_file
.
c_str
()
);
deb
.
logFile
(
debug_file
);
}
//
...
...
src/Various/DebugStream.cc
View file @
63977bf7
...
...
@@ -214,7 +214,7 @@ const DebugStream& DebugStream::operator=( const DebugStream& r )
show_datetime
=
r
.
show_datetime
;
fname
=
r
.
fname
;
if
(
!
r
.
fname
.
empty
()
)
logFile
(
fname
.
c_str
()
);
logFile
(
fname
);
return
*
this
;
}
...
...
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