Skip to content

U
uniset2
Commit dc1fabfe authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(2.0): рефакторинг DebugStream. unideb --> ulog, добавлены новые функции…

(2.0): рефакторинг DebugStream. unideb --> ulog, добавлены новые функции (is_xxx(), level1(), info() )
parent d357e85b
Show whitespace changes
Inline Side-by-side
Showing with 2127 additions and 1916 deletions
TODO
View file @ dc1fabfe
......@@ -27,3 +27,5 @@ codegen:
Version 2.0
============
- написать документацию по ModbusSlave
- рефакторинг класса логов (DebugStream)
- циклическое хранилище для аварийных следов на основе SQLite
Utilities/Admin/admin.cc
View file @ dc1fabfe
......@@ -448,7 +448,7 @@ int omap()
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << " configuration init FAILED!!! \n";
ulog.crit() << " configuration init FAILED!!! \n";
return 1;
}
return 0;
......
Utilities/MBTester/MBSlave.cc
View file @ dc1fabfe
......@@ -381,7 +381,7 @@ ModbusRTU::mbErrCode MBSlave::fileTransfer( ModbusRTU::FileTransferMessage& quer
int fd = open(fname.c_str(), O_RDONLY | O_NONBLOCK );
if( fd <= 0 )
{
dlog[Debug::WARN] << "(fileTransfer): open '" << fname << "' with error: " << strerror(errno) << endl;
dlog.warn() << "(fileTransfer): open '" << fname << "' with error: " << strerror(errno) << endl;
return ModbusRTU::erOperationFailed;
}
......@@ -393,7 +393,7 @@ ModbusRTU::mbErrCode MBSlave::fileTransfer( ModbusRTU::FileTransferMessage& quer
int ret = ::read(fd,&buf,sizeof(buf));
if( ret < 0 )
{
dlog[Debug::WARN] << "(fileTransfer): read from '" << fname << "' with error: " << strerror(errno) << endl;
dlog.warn() << "(fileTransfer): read from '" << fname << "' with error: " << strerror(errno) << endl;
close(fd);
return ModbusRTU::erOperationFailed;
}
......@@ -407,7 +407,7 @@ ModbusRTU::mbErrCode MBSlave::fileTransfer( ModbusRTU::FileTransferMessage& quer
struct stat fs;
if( fstat(fd,&fs) < 0 )
{
dlog[Debug::WARN] << "(fileTransfer): fstat for '" << fname << "' with error: " << strerror(errno) << endl;
dlog.warn() << "(fileTransfer): fstat for '" << fname << "' with error: " << strerror(errno) << endl;
close(fd);
return ModbusRTU::erOperationFailed;
}
......@@ -422,7 +422,7 @@ ModbusRTU::mbErrCode MBSlave::fileTransfer( ModbusRTU::FileTransferMessage& quer
if( !reply.set(query.numfile,numpacks,query.numpacket,buf,ret) )
{
dlog[Debug::WARN] << "(fileTransfer): set date failed..." << endl;
dlog.warn() << "(fileTransfer): set date failed..." << endl;
return ModbusRTU::erOperationFailed;
}
......
Utilities/MBTester/MBTCPServer.cc
View file @ dc1fabfe
......@@ -376,7 +376,7 @@ ModbusRTU::mbErrCode MBTCPServer::fileTransfer( ModbusRTU::FileTransferMessage&
int fd = open(fname.c_str(), O_RDONLY | O_NONBLOCK );
if( fd <= 0 )
{
dlog[Debug::WARN] << "(fileTransfer): open '" << fname << "' with error: " << strerror(errno) << endl;
dlog.warn() << "(fileTransfer): open '" << fname << "' with error: " << strerror(errno) << endl;
return ModbusRTU::erOperationFailed;
}
......@@ -388,7 +388,7 @@ ModbusRTU::mbErrCode MBTCPServer::fileTransfer( ModbusRTU::FileTransferMessage&
int ret = ::read(fd,&buf,sizeof(buf));
if( ret < 0 )
{
dlog[Debug::WARN] << "(fileTransfer): read from '" << fname << "' with error: " << strerror(errno) << endl;
dlog.warn() << "(fileTransfer): read from '" << fname << "' with error: " << strerror(errno) << endl;
close(fd);
return ModbusRTU::erOperationFailed;
}
......@@ -402,7 +402,7 @@ ModbusRTU::mbErrCode MBTCPServer::fileTransfer( ModbusRTU::FileTransferMessage&
struct stat fs;
if( fstat(fd,&fs) < 0 )
{
dlog[Debug::WARN] << "(fileTransfer): fstat for '" << fname << "' with error: " << strerror(errno) << endl;
dlog.warn() << "(fileTransfer): fstat for '" << fname << "' with error: " << strerror(errno) << endl;
close(fd);
return ModbusRTU::erOperationFailed;
}
......@@ -417,7 +417,7 @@ ModbusRTU::mbErrCode MBTCPServer::fileTransfer( ModbusRTU::FileTransferMessage&
if( !reply.set(query.numfile,numpacks,query.numpacket,buf,ret) )
{
dlog[Debug::WARN] << "(fileTransfer): set date failed..." << endl;
dlog.warn() << "(fileTransfer): set date failed..." << endl;
return ModbusRTU::erOperationFailed;
}
......
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
View file @ dc1fabfe
......@@ -89,16 +89,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
}
catch(CORBA::SystemException&amp; ex)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl;
}
catch(...)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
}
if( !active )
......@@ -143,8 +146,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
break;
}
if( !activated )
unideb[Debug::CRIT] &lt;&lt; myname
if( !activated &amp;&amp; ulog.is_crit() )
ulog.crit() &lt;&lt; myname
&lt;&lt; "(preAskSensors): ************* don`t activated?! ************" &lt;&lt; endl;
for( ;; )
......@@ -162,15 +165,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
}
catch(SystemError&amp; err)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; err &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; err &lt;&lt; endl;
}
catch(Exception&amp; ex)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
}
catch(...)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(preAskSensors): catch(...)" &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(preAskSensors): catch(...)" &lt;&lt; endl;
}
msleep(askPause);
}
......@@ -185,7 +191,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
<xsl:if test="normalize-space(@vartype)='out'">
if( _sid == <xsl:value-of select="../../@name"/> )
{
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt; endl;
if( ulog.is_level2() )
ulog.level2() &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = _val;
<xsl:call-template name="setdata"/>
return;
......@@ -217,16 +224,16 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
</xsl:if>
</xsl:if>
</xsl:for-each>
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
&lt;&lt; _sid &lt;&lt; endl;
return 0;
}
catch(Exception&amp; ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
}
......@@ -292,8 +299,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch(Exception&amp; ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -328,8 +335,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch(Exception&amp; ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -344,8 +351,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch(Exception&amp; ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......
Utilities/codegen/ctl-cpp-cc-alone.xsl
View file @ dc1fabfe
......@@ -94,16 +94,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
}
catch(CORBA::SystemException&amp; ex)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl;
}
catch(...)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
}
if( !active )
......@@ -154,7 +157,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
<xsl:if test="normalize-space(@vartype)='out'">
if( _sid == <xsl:value-of select="../../@name"/> )
{
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt; endl;
if( ulog.is_level2() )
ulog.level2() &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = " &lt;&lt; _val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = _val;
return;
}
......@@ -176,8 +180,8 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
</xsl:if>
</xsl:for-each>
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
&lt;&lt; _sid &lt;&lt; endl;
return 0;
......@@ -228,7 +232,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -263,8 +268,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch( Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -279,8 +284,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch( Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
......
Utilities/codegen/ctl-cpp-cc-ask.xsl
View file @ dc1fabfe
......@@ -88,16 +88,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
}
catch(CORBA::SystemException&amp; ex)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl;
}
catch(...)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
}
if( !active )
......@@ -113,7 +116,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
<xsl:if test="normalize-space(@vartype)='out'">
if( _sid == <xsl:value-of select="@name"/> )
{
unideb[Debug::LEVEL2] &lt;&lt; "(setState): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt; _val &lt;&lt; endl;
if( ulog.is_level2() )
ulog.level2() &lt;&lt; "(setState): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt; _val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = _val;
<xsl:call-template name="setdata"/>
return;
......@@ -184,14 +188,14 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
}
</xsl:for-each>
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
&lt;&lt; _sid &lt;&lt; endl;
}
catch(Exception&amp; ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
......@@ -210,8 +214,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
break;
}
if( !activated )
unideb[Debug::CRIT] &lt;&lt; myname
if( !activated &amp;&amp; ulog.is_crit() )
ulog.crit() &lt;&lt; myname
&lt;&lt; "(preAskSensors): ************* don`t activated?! ************" &lt;&lt; endl;
for( ;; )
......@@ -228,15 +232,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
}
catch(SystemError&amp; err)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; err &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; err &lt;&lt; endl;
}
catch(Exception&amp; ex)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
}
catch(...)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(preAskSensors): catch(...)" &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(preAskSensors): catch(...)" &lt;&lt; endl;
}
msleep(askPause);
}
......@@ -268,8 +275,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch( UniSetTypes::Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
}
......@@ -286,8 +293,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch( UniSetTypes::Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
}
......@@ -305,8 +312,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
}
catch( UniSetTypes::Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
}
......
Utilities/codegen/ctl-cpp-cc.xsl
View file @ dc1fabfe
......@@ -93,16 +93,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
}
catch(CORBA::SystemException&amp; ex)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl;
}
catch(...)
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(execute): catch ..." &lt;&lt; endl;
}
if( !active )
......@@ -118,7 +121,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId sid
<xsl:if test="normalize-space(@vartype)='out'">
if( sid == <xsl:value-of select="@name"/> )
{
unideb[Debug::LEVEL2] &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt; val &lt;&lt; endl;
if( ulog.is_level2() )
ulog.level2() &lt;&lt; "(setValue): <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = " &lt;&lt; val &lt;&lt; endl;
<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = val;
return;
}
......@@ -174,7 +178,8 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
</xsl:for-each>
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getValue): Обращение к неизвестному датчику sid="
&lt;&lt; _sid &lt;&lt; endl;
return 0;
}
......@@ -209,8 +214,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
}
catch( Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -227,8 +232,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
}
catch( Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -246,8 +251,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
}
catch( Exception&amp; ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......@@ -264,7 +269,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId code,
}
catch( Exception&amp; ex )
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(setmsg): " &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; myname &lt;&lt; "(setmsg): " &lt;&lt; ex &lt;&lt; endl;
throw;
}
</xsl:template>
......
Utilities/codegen/ctl-cpp-common.xsl
View file @ dc1fabfe
......@@ -90,7 +90,7 @@
</xsl:when>
<xsl:when test="$GENTYPE='CHECK'">
<xsl:if test="normalize-space(@no_check_id)!='1'">
<xsl:if test="normalize-space(../../@id)=''">unideb[Debug::WARN] &lt;&lt; myname &lt;&lt; ": Not found (Message)OID for mid_<xsl:value-of select="normalize-space(../../@name)"/>" &lt;&lt; endl;
<xsl:if test="normalize-space(../../@id)=''">if( ulog.is_warn() ) ulog.warn() &lt;&lt; myname &lt;&lt; ": Not found (Message)OID for mid_<xsl:value-of select="normalize-space(../../@name)"/>" &lt;&lt; endl;
</xsl:if>
</xsl:if>
</xsl:when>
......@@ -101,8 +101,8 @@
<xsl:when test="$GENTYPE='A'">
if( _code == mid_<xsl:value-of select="../../@name"/> )
{
if( unideb.debugging(Debug::LEVEL8) )
unideb(Debug::LEVEL8) &lt;&lt; "<xsl:value-of select="../../@name"/>" &lt;&lt; endl;
if( ulog.is_level8() )
ulog.level8() &lt;&lt; "<xsl:value-of select="../../@name"/>" &lt;&lt; endl;
m_<xsl:value-of select="../../@name"/> = _state;
try
{
......@@ -126,8 +126,8 @@
}
catch( UniSetTypes::Exception&amp; ex )
{
if( unideb.debugging(Debug::LEVEL1) )
unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_level1() )
ulog.level1() &lt;&lt; getName() &lt;&lt; ex &lt;&lt; endl;
}
}
</xsl:when>
......@@ -283,10 +283,11 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::sysCommand( SystemMessage* _sm )
switch( _sm->command )
{
case SystemMessage::WatchDog:
unideb &lt;&lt; myname &lt;&lt; "(sysCommand): WatchDog" &lt;&lt; endl;
ulog &lt;&lt; myname &lt;&lt; "(sysCommand): WatchDog" &lt;&lt; endl;
if( !active || !ptStartUpTimeout.checkTime() )
{
unideb[Debug::WARN] &lt;&lt; myname &lt;&lt; "(sysCommand): игнорируем WatchDog, потому-что только-что стартанули" &lt;&lt; endl;
if( ulog.is_warn() )
ulog.warn() &lt;&lt; myname &lt;&lt; "(sysCommand): игнорируем WatchDog, потому-что только-что стартанули" &lt;&lt; endl;
break;
}
case SystemMessage::StartUp:
......@@ -312,12 +313,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::sysCommand( SystemMessage* _sm )
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb &lt;&lt; myname &lt;&lt; "(sysCommand): logRotate" &lt;&lt; endl;
string fname = unideb.getLogFile();
ulog &lt;&lt; myname &lt;&lt; "(sysCommand): logRotate" &lt;&lt; endl;
string fname( ulog.getLogFile() );
if( !fname.empty() )
{
unideb.logFile(fname.c_str());
unideb &lt;&lt; myname &lt;&lt; "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" &lt;&lt; endl;
ulog.logFile(fname.c_str());
ulog &lt;&lt; myname &lt;&lt; "(sysCommand): ***************** ulog LOG ROTATE *****************" &lt;&lt; endl;
}
}
break;
......@@ -374,9 +375,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
if( _testID == DefaultObjectId )
return;
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] &lt;&lt; myname &lt;&lt; "(waitSM): waiting SM ready "
ulog.info() &lt;&lt; myname &lt;&lt; "(waitSM): waiting SM ready "
&lt;&lt; wait_msec &lt;&lt; " msec"
&lt;&lt; " testID=" &lt;&lt; _testID &lt;&lt; endl;
}
......@@ -388,7 +389,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
&lt;&lt; "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение "
&lt;&lt; wait_msec &lt;&lt; " мсек";
unideb[Debug::CRIT] &lt;&lt; err.str() &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; err.str() &lt;&lt; endl;
terminate();
abort();
// kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
......@@ -405,7 +407,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
&lt;&lt; "(waitSM): Не дождались готовности(work) SharedMemory к работе в течение "
&lt;&lt; wait_msec &lt;&lt; " мсек";
unideb[Debug::CRIT] &lt;&lt; err.str() &lt;&lt; endl;
if( ulog.is_crit() )
ulog.crit() &lt;&lt; err.str() &lt;&lt; endl;
terminate();
abort();
// kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
......@@ -531,7 +534,7 @@ askPause(2000),
</xsl:for-each>
end_private(false)
{
unideb[Debug::CRIT] &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
ulog.crit() &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
throw Exception( string(myname+": init failed!!!") );
}
// -----------------------------------------------------------------------------
......@@ -704,14 +707,16 @@ end_private(false)
<xsl:if test="normalize-space(@min)!=''">
if( <xsl:value-of select="@name"/> &lt; <xsl:value-of select="@min"/> )
{
unideb[Debug::WARN] &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &lt; <xsl:value-of select="@min"/>" &lt;&lt; endl;
if( ulog.is_warn() )
ulog.warn() &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &lt; <xsl:value-of select="@min"/>" &lt;&lt; endl;
<xsl:if test="normalize-space(@no_range_exception)=''">throw UniSetTypes::SystemError(myname+"(init): <xsl:value-of select="@name"/> &lt; <xsl:value-of select="@min"/>");</xsl:if>
}
</xsl:if>
<xsl:if test="normalize-space(@max)!=''">
if( <xsl:value-of select="@name"/> &gt; <xsl:value-of select="@max"/> )
{
unideb[Debug::WARN] &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &gt; <xsl:value-of select="@max"/>" &lt;&lt; endl;
if( ulog.is_warn() )
ulog.warn() &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &gt; <xsl:value-of select="@max"/>" &lt;&lt; endl;
<xsl:if test="normalize-space(@no_range_exception)=''">throw UniSetTypes::SystemError(myname+"(init): <xsl:value-of select="@name"/> &gt; <xsl:value-of select="@max"/>");</xsl:if>
}
</xsl:if>
......@@ -769,24 +774,29 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
{
if( _code == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] &lt;&lt; getName()
if( ulog.is_crit() )
ulog.crit() &lt;&lt; getName()
&lt;&lt; "(alarm): попытка послать сообщение с DefaultObjectId"
&lt;&lt; endl;
return false;
}
unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; "(alarm): ";
if( ulog.is_level1() )
{
ulog.level1() &lt;&lt; getName() &lt;&lt; "(alarm): ";
if( _state )
unideb(Debug::LEVEL1) &lt;&lt; "SEND ";
ulog.level1(false) &lt;&lt; "SEND ";
else
unideb(Debug::LEVEL1) &lt;&lt; "RESET ";
ulog.level1(false) &lt;&lt; "RESET ";
unideb(Debug::LEVEL1) &lt;&lt; endl;
ulog.level1(false) &lt;&lt; endl;
}
<xsl:for-each select="//msgmap/item">
if( _code == <xsl:value-of select="@name"/> )
{
unideb[Debug::LEVEL1] &lt;&lt; "<xsl:value-of select="@name"/>" &lt;&lt; endl;
if( ulog.is_level1() )
ulog.level1() &lt;&lt; "<xsl:value-of select="@name"/>" &lt;&lt; endl;
try
{
m_<xsl:value-of select="@name"/> = _state;
......@@ -801,7 +811,8 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
}
</xsl:for-each>
unideb[Debug::LEVEL1] &lt;&lt; " not found MessgeOID?!!" &lt;&lt; endl;
if( ulog.is_level1() )
ulog.level1() &lt;&lt; " not found MessgeOID?!!" &lt;&lt; endl;
return false;
}
// -----------------------------------------------------------------------------
......@@ -820,7 +831,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
}
catch( UniSetTypes::Exception&amp; ex )
{
unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; ex &lt;&lt; endl;
if( ulog.is_level1() )
ulog.level1() &lt;&lt; getName() &lt;&lt; ex &lt;&lt; endl;
}
}
</xsl:for-each>
......@@ -878,7 +890,7 @@ confnode(0),
activated(false),
askPause(2000)
{
unideb[Debug::CRIT] &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
ulog.crit() &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
throw Exception( string(myname+": init failed!!!") );
}
// -----------------------------------------------------------------------------
......@@ -1039,17 +1051,21 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
{
if( _code == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] &lt;&lt; getName()
if( ulog.is_crit() )
ulog.crit() &lt;&lt; getName()
&lt;&lt; "(alarm): попытка послать сообщение с DefaultObjectId"
&lt;&lt; endl;
return false;
}
unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; "(alarm): ";
if( ulog.is_level1() )
{
ulog.level1() &lt;&lt; getName() &lt;&lt; "(alarm): ";
if( _state )
unideb(Debug::LEVEL1) &lt;&lt; "SEND (" &lt;&lt; _code &lt;&lt; ")";
ulog.level1(false) &lt;&lt; "SEND (" &lt;&lt; _code &lt;&lt; ")";
else
unideb(Debug::LEVEL1) &lt;&lt; "RESET (" &lt;&lt; _code &lt;&lt; ")";
ulog.level1(false) &lt;&lt; "RESET (" &lt;&lt; _code &lt;&lt; ")";
}
<xsl:for-each select="//sensors/item">
......@@ -1058,7 +1074,8 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
</xsl:call-template>
</xsl:for-each>
unideb(Debug::LEVEL8) &lt;&lt; " not found MessgeOID?!!" &lt;&lt; endl;
if( ulog.is_level8() )
ulog.level8() &lt;&lt; " not found MessgeOID?!!" &lt;&lt; endl;
return false;
}
// -----------------------------------------------------------------------------
......
Utilities/codegen/ctl-cpp-main-alone.xsl
View file @ dc1fabfe
......@@ -56,7 +56,7 @@ int main( int argc,char* argv[] )
string logfilename = conf->getArgParam("--logfile","<xsl:value-of select="$CLASSNAME"/>.log");
string logname( conf->getLogDir() + logfilename );
unideb.logFile( logname.c_str() );
ulog.logFile( logname.c_str() );
// определяем ID объекта
ObjectId ID(DefaultObjectId);
......
Utilities/codegen/ctl-cpp-main.xsl
View file @ dc1fabfe
......@@ -58,7 +58,7 @@ int main( int argc, const char** argv )
string logfilename = conf->getArgParam("--logfile","<xsl:value-of select="$CLASSNAME"/>.log");
string logname( conf->getLogDir() + logfilename );
unideb.logFile( logname.c_str() );
ulog.logFile( logname.c_str() );
<xsl:if test="not(normalize-space(//@OID))=''">
<xsl:value-of select="$CLASSNAME"/> obj;
......
Utilities/codegen/skel-main.cc
View file @ dc1fabfe
......@@ -14,14 +14,14 @@ int main( int argc, const char **argv )
string logfilename = conf->getArgParam("--logfile", "Skel.log");
string logname( conf->getLogDir() + logfilename );
// dlog.logFile( logname.c_str() );
unideb.logFile( logname.c_str() );
ulog.logFile( logname.c_str() );
// conf->initDebug(dlog,"dlog");
ObjectsActivator act;
xmlNode* cnode = conf->getNode("Skel");
if( cnode == NULL )
{
dlog[Debug::CRIT] << "(Skel): not found <Skel> in conffile" << endl;
dlog.crit() << "(Skel): not found <Skel> in conffile" << endl;
return 1;
}
......@@ -31,8 +31,8 @@ int main( int argc, const char **argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(Skel::main): -------------- Skel START -------------------------\n\n";
ulog.ebug::ANY) << "\n\n\n";
ulog.ebug::ANY] << "(Skel::main): -------------- Skel START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(Skel::main): -------------- Skel START -------------------------\n\n";
act.run(false);
......
conf/libuniset.spec
View file @ dc1fabfe
......@@ -353,6 +353,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
- refactoring <depends> mechanism
- add iofront=[01,10] to IOBase
- remove deprecated interfaces (Storages,CycleStorage,TableStorage,TextIndex,..)
- rename unideb --> ulog
- DebugStream refactoring (add new function)
* Tue Dec 10 2013 Pavel Vainerman <pv@altlinux.ru> 1.7-alt3
- add RRDServer
......
extensions/DBServer-MySQL/DBServer_MySQL.cc
View file @ dc1fabfe
......@@ -147,32 +147,32 @@ void DBServer_MySQL::parse( UniSetTypes::ConfirmMessage* cem )
<< " AND time='" << ui.timeToString(cem->time, ":") <<" '"
<< " AND time_usec='" << cem->time_usec <<" '";
if( unideb.debugging(DBLEVEL) )
unideb[DBLEVEL] << myname << "(update_confirm): " << data.str() << endl;
if( ulog.debugging(DBLEVEL) )
ulog[DBLEVEL] << myname << "(update_confirm): " << data.str() << endl;
if( !writeToBase(data.str()) )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): db error: "<< db->error() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(update_confirm): db error: "<< db->error() << endl;
db->freeResult();
}
}
catch( Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(update_confirm): " << ex << endl;
}
catch( ... )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): catch..." << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(update_confirm): catch..." << endl;
}
}
//--------------------------------------------------------------------------------------------
bool DBServer_MySQL::writeToBase( const string& query )
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(writeToBase): " << query << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(writeToBase): " << query << endl;
// cout << "DBServer_MySQL: " << query << endl;
if( !db || !connect_ok )
{
......@@ -188,8 +188,8 @@ bool DBServer_MySQL::writeToBase( const string& query )
qbuf.pop();
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
if( ulog.is_crit() )
ulog.crit() << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
<< ") overflow! lost query: " << qlost << endl;
}
return false;
......@@ -231,9 +231,9 @@ void DBServer_MySQL::flushBuffer()
string err(db->error());
if( err.empty() )
db->freeResult();
else if( unideb.debugging(Debug::CRIT) )
else if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(writeToBase): error: " << err <<
ulog.crit() << myname << "(writeToBase): error: " << err <<
" lost query: " << qbuf.front() << endl;
}
......@@ -264,31 +264,33 @@ void DBServer_MySQL::parse( UniSetTypes::SensorMessage *si )
<< si->value << "," // value
<< si->node << ")"; // node
if( unideb.debugging(DBLEVEL) )
unideb[DBLEVEL] << myname << "(insert_main_history): " << data.str() << endl;
if( ulog.debugging(DBLEVEL) )
ulog[DBLEVEL] << myname << "(insert_main_history): " << data.str() << endl;
if( !writeToBase(data.str()) )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(insert) sensor msg error: "<< db->error() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(insert) sensor msg error: "<< db->error() << endl;
db->freeResult();
}
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << myname << "(insert_main_history): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(insert_main_history): " << ex << endl;
}
catch( ... )
{
unideb[Debug::CRIT] << myname << "(insert_main_history): catch ..." << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(insert_main_history): catch ..." << endl;
}
}
//--------------------------------------------------------------------------------------------
void DBServer_MySQL::init_dbserver()
{
DBServer::init_dbserver();
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(init): ..." << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(init): ..." << endl;
if( connect_ok )
{
......@@ -312,7 +314,7 @@ void DBServer_MySQL::init_dbserver()
UniXML::iterator it(node);
unideb[DBLogInfoLevel] << myname << "(init): init connection.." << endl;
ulog[DBLogInfoLevel] << myname << "(init): init connection.." << endl;
string dbname(conf->getProp(node,"dbname"));
string dbnode(conf->getProp(node,"dbnode"));
string user(conf->getProp(node,"dbuser"));
......@@ -335,8 +337,8 @@ void DBServer_MySQL::init_dbserver()
if( dbnode.empty() )
dbnode = "localhost";
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(init): connect dbnode=" << dbnode
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(init): connect dbnode=" << dbnode
<< "\tdbname=" << dbname
<< " pingTime=" << PingTime
<< " ReconnectTime=" << ReconnectTime << endl;
......@@ -344,8 +346,8 @@ void DBServer_MySQL::init_dbserver()
if( !db->connect(dbnode, user, password, dbname) )
{
// ostringstream err;
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname
if( ulog.is_crit() )
ulog.crit() << myname
<< "(init): DB connection error: "
<< db->error() << endl;
// throw Exception( string(myname+"(init): не смогли создать соединение с БД "+db->error()) );
......@@ -353,8 +355,8 @@ void DBServer_MySQL::init_dbserver()
}
else
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(init): connect [OK]" << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(init): connect [OK]" << endl;
connect_ok = true;
askTimer(DBServer_MySQL::ReconnectTimer,0);
askTimer(DBServer_MySQL::PingTimer,PingTime);
......@@ -370,8 +372,8 @@ void DBServer_MySQL::createTables( DBInterface *db )
UniXML_iterator it( conf->getNode("Tables") );
if(!it)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << ": section <Tables> not found.."<< endl;
if( ulog.is_crit() )
ulog.crit() << myname << ": section <Tables> not found.."<< endl;
throw Exception();
}
......@@ -379,12 +381,12 @@ void DBServer_MySQL::createTables( DBInterface *db )
{
if( it.getName() != "comment" )
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(createTables): create " << it.getName() << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(createTables): create " << it.getName() << endl;
ostringstream query;
query << "CREATE TABLE " << conf->getProp(it,"name") << "(" << conf->getProp(it,"create") << ")";
if( !db->query(query.str()) && unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(createTables): error: \t\t" << db->error() << endl;
if( !db->query(query.str()) && ulog.is_crit() )
ulog.crit() << myname << "(createTables): error: \t\t" << db->error() << endl;
}
}
}
......@@ -397,8 +399,8 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
{
if( !db->ping() )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(timerInfo): DB lost connection.." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(timerInfo): DB lost connection.." << endl;
connect_ok = false;
askTimer(DBServer_MySQL::PingTimer,0);
askTimer(DBServer_MySQL::ReconnectTimer,ReconnectTime);
......@@ -406,16 +408,16 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
else
{
connect_ok = true;
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(timerInfo): DB ping ok" << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(timerInfo): DB ping ok" << endl;
}
}
break;
case DBServer_MySQL::ReconnectTimer:
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(timerInfo): reconnect timer" << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(timerInfo): reconnect timer" << endl;
if( db->isConnection() )
{
if( db->ping() )
......@@ -425,8 +427,8 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
askTimer(DBServer_MySQL::PingTimer,PingTime);
}
connect_ok = false;
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(timerInfo): DB no connection.." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(timerInfo): DB no connection.." << endl;
}
else
init_dbserver();
......@@ -434,8 +436,8 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
break;
default:
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(timerInfo): Unknown TimerID=" << tm->id << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(timerInfo): Unknown TimerID=" << tm->id << endl;
break;
}
}
......
extensions/DBServer-MySQL/main.cc
View file @ dc1fabfe
......@@ -31,7 +31,7 @@ int main(int argc, char** argv)
{
if( ID != UniSetTypes::DefaultObjectId )
{
unideb[Debug::WARN] << "(DBServer::main): переопределяем ID заданнй в "
ulog.warn() << "(DBServer::main): переопределяем ID заданнй в "
<< conf->getConfFileName() << endl;
}
......
extensions/DBServer-SQLite/DBServer_SQLite.cc
View file @ dc1fabfe
......@@ -143,31 +143,31 @@ void DBServer_SQLite::parse( UniSetTypes::ConfirmMessage* cem )
<< " AND time='" << ui.timeToString(cem->time, ":") <<" '"
<< " AND time_usec='" << cem->time_usec <<" '";
if( unideb.debugging(DBLEVEL) )
unideb[DBLEVEL] << myname << "(update_confirm): " << data.str() << endl;
if( ulog.debugging(DBLEVEL) )
ulog[DBLEVEL] << myname << "(update_confirm): " << data.str() << endl;
if( !writeToBase(data.str()) )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): db error: "<< db->error() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(update_confirm): db error: "<< db->error() << endl;
}
}
catch( Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(update_confirm): " << ex << endl;
}
catch( ... )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): catch..." << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(update_confirm): catch..." << endl;
}
}
//--------------------------------------------------------------------------------------------
bool DBServer_SQLite::writeToBase( const string& query )
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(writeToBase): " << query << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(writeToBase): " << query << endl;
// cout << "DBServer_SQLite: " << query << endl;
if( !db || !connect_ok )
{
......@@ -183,8 +183,8 @@ bool DBServer_SQLite::writeToBase( const string& query )
qbuf.pop();
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
if( ulog.is_crit() )
ulog.crit() << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
<< ") overflow! lost query: " << qlost << endl;
}
return false;
......@@ -207,9 +207,9 @@ void DBServer_SQLite::flushBuffer()
// Сперва пробуем очистить всё что накопилось в очереди до этого...
while( !qbuf.empty() )
{
if( !db->insert(qbuf.front()) && unideb.debugging(Debug::CRIT) )
if( !db->insert(qbuf.front()) && ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(writeToBase): error: " << db->error() <<
ulog.crit() << myname << "(writeToBase): error: " << db->error() <<
" lost query: " << qbuf.front() << endl;
}
qbuf.pop();
......@@ -239,30 +239,30 @@ void DBServer_SQLite::parse( UniSetTypes::SensorMessage *si )
<< si->value << "," // value
<< si->node << ")"; // node
if( unideb.debugging(DBLEVEL) )
unideb[DBLEVEL] << myname << "(insert_main_history): " << data.str() << endl;
if( ulog.debugging(DBLEVEL) )
ulog[DBLEVEL] << myname << "(insert_main_history): " << data.str() << endl;
if( !writeToBase(data.str()) )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(insert) sensor msg error: "<< db->error() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(insert) sensor msg error: "<< db->error() << endl;
}
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << myname << "(insert_main_history): " << ex << endl;
ulog.crit() << myname << "(insert_main_history): " << ex << endl;
}
catch( ... )
{
unideb[Debug::CRIT] << myname << "(insert_main_history): catch ..." << endl;
ulog.crit() << myname << "(insert_main_history): catch ..." << endl;
}
}
//--------------------------------------------------------------------------------------------
void DBServer_SQLite::init_dbserver()
{
DBServer::init_dbserver();
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(init): ..." << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(init): ..." << endl;
if( connect_ok )
{
......@@ -286,7 +286,7 @@ void DBServer_SQLite::init_dbserver()
UniXML::iterator it(node);
unideb[DBLogInfoLevel] << myname << "(init): init connection.." << endl;
ulog[DBLogInfoLevel] << myname << "(init): init connection.." << endl;
string dbfile(conf->getProp(node,"dbfile"));
tblMap[UniSetTypes::Message::SensorInfo] = "main_history";
......@@ -303,16 +303,16 @@ void DBServer_SQLite::init_dbserver()
else
lastRemove = false;
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(init): connect dbfile=" << dbfile
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(init): connect dbfile=" << dbfile
<< " pingTime=" << PingTime
<< " ReconnectTime=" << ReconnectTime << endl;
if( !db->connect(dbfile,false) )
{
// ostringstream err;
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname
if( ulog.is_crit() )
ulog.crit() << myname
<< "(init): DB connection error: "
<< db->error() << endl;
// throw Exception( string(myname+"(init): не смогли создать соединение с БД "+db->error()) );
......@@ -320,8 +320,8 @@ void DBServer_SQLite::init_dbserver()
}
else
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(init): connect [OK]" << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(init): connect [OK]" << endl;
connect_ok = true;
askTimer(DBServer_SQLite::ReconnectTimer,0);
askTimer(DBServer_SQLite::PingTimer,PingTime);
......@@ -337,8 +337,8 @@ void DBServer_SQLite::createTables( SQLiteInterface *db )
UniXML_iterator it( conf->getNode("Tables") );
if(!it)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << ": section <Tables> not found.."<< endl;
if( ulog.is_crit() )
ulog.crit() << myname << ": section <Tables> not found.."<< endl;
throw Exception();
}
......@@ -346,12 +346,12 @@ void DBServer_SQLite::createTables( SQLiteInterface *db )
{
if( it.getName() != "comment" )
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(createTables): create " << it.getName() << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(createTables): create " << it.getName() << endl;
ostringstream query;
query << "CREATE TABLE " << conf->getProp(it,"name") << "(" << conf->getProp(it,"create") << ")";
if( !db->query(query.str()) && unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(createTables): error: \t\t" << db->error() << endl;
if( !db->query(query.str()) && ulog.is_crit() )
ulog.crit() << myname << "(createTables): error: \t\t" << db->error() << endl;
}
}
}
......@@ -364,8 +364,8 @@ void DBServer_SQLite::timerInfo( UniSetTypes::TimerMessage* tm )
{
if( !db->ping() )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(timerInfo): DB lost connection.." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(timerInfo): DB lost connection.." << endl;
connect_ok = false;
askTimer(DBServer_SQLite::PingTimer,0);
askTimer(DBServer_SQLite::ReconnectTimer,ReconnectTime);
......@@ -373,16 +373,16 @@ void DBServer_SQLite::timerInfo( UniSetTypes::TimerMessage* tm )
else
{
connect_ok = true;
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(timerInfo): DB ping ok" << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(timerInfo): DB ping ok" << endl;
}
}
break;
case DBServer_SQLite::ReconnectTimer:
{
if( unideb.debugging(DBLogInfoLevel) )
unideb[DBLogInfoLevel] << myname << "(timerInfo): reconnect timer" << endl;
if( ulog.debugging(DBLogInfoLevel) )
ulog[DBLogInfoLevel] << myname << "(timerInfo): reconnect timer" << endl;
if( db->isConnection() )
{
if( db->ping() )
......@@ -392,8 +392,8 @@ void DBServer_SQLite::timerInfo( UniSetTypes::TimerMessage* tm )
askTimer(DBServer_SQLite::PingTimer,PingTime);
}
connect_ok = false;
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(timerInfo): DB no connection.." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(timerInfo): DB no connection.." << endl;
}
else
init_dbserver();
......@@ -401,8 +401,8 @@ void DBServer_SQLite::timerInfo( UniSetTypes::TimerMessage* tm )
break;
default:
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(timerInfo): Unknown TimerID=" << tm->id << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(timerInfo): Unknown TimerID=" << tm->id << endl;
break;
}
}
......
extensions/DBServer-SQLite/main.cc
View file @ dc1fabfe
......@@ -31,7 +31,7 @@ int main(int argc, char** argv)
{
if( ID != UniSetTypes::DefaultObjectId )
{
unideb[Debug::WARN] << "(DBServer::main): переопределяем ID заданнй в "
ulog.warn() << "(DBServer::main): переопределяем ID заданнй в "
<< conf->getConfFileName() << endl;
}
......
extensions/IOControl/IOControl.cc
View file @ dc1fabfe
......@@ -64,7 +64,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
maxCardNum = conf->getArgInt("--"+prefix+"-max-cardnum","10");
cards.resize(maxCardNum+1);
dlog[Debug::INFO] << myname << "(init): numcards=" << numcards << endl;
dlog.info() << myname << "(init): numcards=" << numcards << endl;
UniXML_iterator it(cnode);
......@@ -89,7 +89,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
{
if( cards[i] == NULL )
{
dlog[Debug::LEVEL3] << myname << "(init): Card N" << i
if( dlog.is_level3() ) dlog.level3() << myname << "(init): Card N" << i
<< " DISABLED! dev='"
<< iodev << "'" << endl;
}
......@@ -98,7 +98,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
{
noCards = false;
cards[i] = new ComediInterface(iodev);
dlog[Debug::LEVEL3] << myname << "(init): ADD card" << i << " dev=" << iodev << endl;
if( dlog.is_level3() ) dlog.level3() << myname << "(init): ADD card" << i << " dev=" << iodev << endl;
}
if( cards[i] != NULL )
......@@ -121,7 +121,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
if( !stype.empty() )
{
dlog[Debug::INFO] << myname
dlog.info() << myname
<< "(init): card" << i
<< " subdev" << s << " set type " << stype << endl;
......@@ -132,7 +132,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
}
}
dlog[Debug::INFO] << myname << "(init): result numcards=" << cards.size() << endl;
dlog.info() << myname << "(init): result numcards=" << cards.size() << endl;
polltime = conf->getArgInt("--"+prefix+"-polltime",it.getProp("polltime"));
if( !polltime )
......@@ -153,11 +153,11 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
{
ostringstream err;
err << myname << ": Unkown ID for " << testlamp;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
dlog[Debug::INFO] << myname << "(init): testLamp_S='" << testlamp << "'" << endl;
dlog.info() << myname << "(init): testLamp_S='" << testlamp << "'" << endl;
}
string tmode = conf->getArgParam("--"+prefix+"-test-mode",it.getProp("testmode_as"));
......@@ -168,11 +168,11 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
{
ostringstream err;
err << myname << ": Unknown ID for " << tmode;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
dlog[Debug::INFO] << myname << "(init): testMode_as='" << testmode << "'" << endl;
dlog.info() << myname << "(init): testMode_as='" << testmode << "'" << endl;
}
shm = new SMInterface(icID,&ui,myid,ic);
......@@ -181,7 +181,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
s_field = conf->getArgParam("--"+prefix+"-s-filter-field");
s_fvalue = conf->getArgParam("--"+prefix+"-s-filter-value");
dlog[Debug::INFO] << myname << "(init): read s_field='" << s_field
dlog.info() << myname << "(init): read s_field='" << s_field
<< "' s_fvalue='" << s_fvalue << "'" << endl;
int blink_msec = conf->getArgPInt("--"+prefix+"-blink-time",it.getProp("blink-time"), 300);
......@@ -205,12 +205,12 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
if( sidTestSMReady == DefaultObjectId )
{
sidTestSMReady = conf->getSensorID("TestMode_S");
dlog[Debug::WARN] << myname
dlog.warn() << myname
<< "(init): Unknown ID for sm-ready-test-sid (--" << prefix << "-sm-ready-test-sid)."
<< " Use 'TestMode_S'" << endl;
}
else
dlog[Debug::INFO] << myname << "(init): test-sid: " << sm_ready_sid << endl;
dlog.info() << myname << "(init): test-sid: " << sm_ready_sid << endl;
// -----------------------
......@@ -222,7 +222,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
{
ostringstream err;
err << myname << ": Not found ID for 'HeartBeat' " << heart;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
......@@ -283,7 +283,7 @@ void IOControl::execute()
}
maxHalf = maxItem / 2;
dlog[Debug::INFO] << myname << "(init): iomap size = " << iomap.size() << endl;
dlog.info() << myname << "(init): iomap size = " << iomap.size() << endl;
cerr << myname << "(iomap size): " << iomap.size() << endl;
......@@ -311,7 +311,7 @@ void IOControl::execute()
}
if( !activated )
dlog[Debug::CRIT] << myname << "(execute): ************* don`t activate?! ************" << endl;
dlog.crit() << myname << "(execute): ************* don`t activate?! ************" << endl;
try
{
......@@ -378,16 +378,16 @@ void IOControl::execute()
}
catch( Exception& ex )
{
dlog[Debug::LEVEL3] << myname << "(execute): " << ex << endl;
if( dlog.is_level3() ) dlog.level3() << myname << "(execute): " << ex << endl;
}
catch(CORBA::SystemException& ex)
{
dlog[Debug::LEVEL3] << myname << "(execute): CORBA::SystemException: "
if( dlog.is_level3() ) dlog.level3() << myname << "(execute): CORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
dlog[Debug::LEVEL3] << myname << "(execute): catch ..." << endl;
if( dlog.is_level3() ) dlog.level3() << myname << "(execute): catch ..." << endl;
}
if( term )
......@@ -508,9 +508,9 @@ void IOControl::ioread( IOInfo* it )
{
int val = card->getAnalogChannel(it->subdev,it->channel, it->range, it->aref);
if( unideb.debugging(Debug::LEVEL3) )
if( dlog.is_level3() )
{
dlog[Debug::LEVEL3] << myname << "(iopoll): read AI "
dlog.level3() << myname << "(iopoll): read AI "
<< " sid=" << it->si.id
<< " subdev=" << it->subdev
<< " chan=" << it->channel
......@@ -524,9 +524,9 @@ void IOControl::ioread( IOInfo* it )
{
bool set = card->getDigitalChannel(it->subdev,it->channel);
/*
if( unideb.debugging(Debug::LEVEL3) )
if( ulog.ebugging(Debug::LEVEL3) )
{
dlog[Debug::LEVEL3] << myname << "(iopoll): read DI "
if( dlog.is_level3() ) dlog.level3() << myname << "(iopoll): read DI "
<< " sid=" << it->si.id
<< " subdev=" << it->subdev
<< " chan=" << it->channel
......@@ -648,28 +648,33 @@ void IOControl::ioread( IOInfo* it )
}
catch(IOController_i::NameNotFound &ex)
{
dlog[Debug::LEVEL3] << myname << "(iopoll):(NameNotFound) " << ex.err << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(iopoll):(NameNotFound) " << ex.err << endl;
}
catch(IOController_i::IOBadParam& ex )
{
dlog[Debug::LEVEL3] << myname << "(iopoll):(IOBadParam) " << ex.err << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(iopoll):(IOBadParam) " << ex.err << endl;
}
catch(IONotifyController_i::BadRange )
{
dlog[Debug::LEVEL3] << myname << "(iopoll): (BadRange)..." << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(iopoll): (BadRange)..." << endl;
}
catch( Exception& ex )
{
dlog[Debug::LEVEL3] << myname << "(iopoll): " << ex << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(iopoll): " << ex << endl;
}
catch(CORBA::SystemException& ex)
{
dlog[Debug::LEVEL3] << myname << "(iopoll): СORBA::SystemException: "
if( dlog.is_level3() )
dlog.level3() << myname << "(iopoll): СORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
dlog[Debug::LEVEL3] << myname << "(iopoll): catch ..." << endl;
if( dlog.is_level3() ) dlog.level3() << myname << "(iopoll): catch ..." << endl;
}
}
......@@ -720,7 +725,8 @@ bool IOControl::initIOItem( UniXML_iterator& it )
if( c.empty() || inf.ncard < 0 || inf.ncard >= (int)cards.size() )
{
dlog[Debug::LEVEL3] << myname
if( dlog.is_level3() )
dlog.level3() << myname
<< "(initIOItem): Unknown or bad card number ("
<< inf.ncard << ") for " << it.getProp("name")
<< " set default=" << defCardNum << endl;
......@@ -752,12 +758,13 @@ bool IOControl::initIOItem( UniXML_iterator& it )
inf.channel = it.getIntProp("channel");
if( inf.channel < 0 || inf.channel > 32 )
{
dlog[Debug::WARN] << myname << "(readItem): Unknown channel: " << inf.channel
if( dlog.is_warn() )
dlog.warn() << myname << "(readItem): Unknown channel: " << inf.channel
<< " for " << it.getProp("name") << endl;
return false;
}
if( !IOBase::initItem(&inf,it,shm,&unideb,myname,filtersize,filterT) )
if( !IOBase::initItem(&inf,it,shm,&dlog,myname,filtersize,filterT) )
return false;
inf.lamp = it.getIntProp("lamp");
......@@ -772,7 +779,8 @@ bool IOControl::initIOItem( UniXML_iterator& it )
inf.range = it.getIntProp("range");
if( inf.range < 0 || inf.range > 3 )
{
dlog[Debug::CRIT] << myname << "(readItem): Unknown 'range': " << inf.range
if( dlog.is_crit() )
dlog.crit() << myname << "(readItem): Unknown 'range': " << inf.range
<< " for " << it.getProp("name")
<< " Must be range=[0..3]" << endl;
return false;
......@@ -781,15 +789,16 @@ bool IOControl::initIOItem( UniXML_iterator& it )
inf.aref = it.getIntProp("aref");
if( inf.aref < 0 || inf.aref > 3 )
{
dlog[Debug::CRIT] << myname << "(readItem): Unknown 'aref': " << inf.aref
if( dlog.is_crit() )
dlog.crit() << myname << "(readItem): Unknown 'aref': " << inf.aref
<< " for " << it.getProp("name")
<< ". Must be aref=[0..3]" << endl;
return false;
}
}
if( unideb.debugging(Debug::LEVEL3) )
dlog[Debug::LEVEL3] << myname << "(readItem): add: " << inf.stype << " " << inf << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(readItem): add: " << inf.stype << " " << inf << endl;
// если вектор уже заполнен
// то увеличиваем его на 10 элементов (с запасом)
......@@ -803,8 +812,9 @@ bool IOControl::initIOItem( UniXML_iterator& it )
{
IOPriority p(prior,maxItem);
pmap.push_back(p);
dlog[Debug::LEVEL3] << myname << "(readItem): add to priority list: " <<
it.getProp("name")
if( dlog.is_level3() )
dlog.level3() << myname << "(readItem): add to priority list: "
<< it.getProp("name")
<< " priority=" << prior << endl;
}
......@@ -862,7 +872,8 @@ void IOControl::sigterm( int signo )
}
catch( Exception& ex )
{
dlog[Debug::LEVEL3] << myname << "(sigterm): " << ex << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(sigterm): " << ex << endl;
}
catch(...){}
}
......@@ -898,7 +909,8 @@ void IOControl::initOutputs()
}
catch( Exception& ex )
{
dlog[Debug::LEVEL3] << myname << "(initOutput): " << ex << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(initOutput): " << ex << endl;
}
}
}
......@@ -939,8 +951,8 @@ void IOControl::initIOCard()
}
catch( Exception& ex)
{
dlog[Debug::CRIT] << myname << "(initIOCard): sid=" << it->si.id
<< " " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initIOCard): sid=" << it->si.id << " " << ex << endl;
}
}
}
......@@ -968,7 +980,8 @@ void IOControl::blink( BlinkList& lst, bool& bstate )
}
catch( Exception& ex )
{
cerr << myname << "(blink): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(blink): " << ex << endl;
}
}
......@@ -1052,7 +1065,7 @@ void IOControl::check_testmode()
}
catch( Exception& ex )
{
dlog[Debug::LEVEL3] << myname << "(sigterm): " << ex << endl;
if( dlog.is_level3() ) dlog.level3() << myname << "(sigterm): " << ex << endl;
}
catch(...){}
}
......@@ -1061,7 +1074,8 @@ void IOControl::check_testmode()
}
catch( Exception& ex)
{
dlog[Debug::CRIT] << myname << "(check_testmode): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(check_testmode): " << ex << endl;
}
catch(...)
{
......@@ -1126,7 +1140,8 @@ void IOControl::check_testlamp()
}
catch( Exception& ex)
{
dlog[Debug::CRIT] << myname << "(check_testlamp): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(check_testlamp): " << ex << endl;
}
catch(...)
{
......@@ -1156,7 +1171,8 @@ IOControl* IOControl::init_iocontrol( int argc, const char* const* argv,
int numcards = conf->getArgPInt("--"+prefix+"-numcards",1);
dlog[Debug::INFO] << "(iocontrol): name = " << name << "(" << ID << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(iocontrol): name = " << name << "(" << ID << ")" << endl;
return new IOControl(ID,icID,ic,numcards,prefix);
}
// -----------------------------------------------------------------------------
......@@ -1226,7 +1242,8 @@ void IOControl::processingMessage( UniSetTypes::VoidMessage* msg )
}
catch(Exception& ex)
{
cout << myname << "(processingMessage): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): " << ex << endl;
}
}
// -----------------------------------------------------------------------------
......@@ -1239,14 +1256,15 @@ void IOControl::sysCommand( SystemMessage* sm )
PassiveTimer ptAct(activateTimeout);
while( !activated && !ptAct.checkTime() )
{
cout << myname << "(sysCommand): wait activate..." << endl;
if( dlog.is_info() )
dlog.info() << myname << "(sysCommand): wait activate..." << endl;
msleep(300);
if( activated )
break;
}
if( !activated )
dlog[Debug::CRIT] << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
if( !activated && dlog.is_crit() )
dlog.crit() << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
askSensors(UniversalIO::UIONotify);
break;
......@@ -1286,20 +1304,20 @@ void IOControl::sysCommand( SystemMessage* sm )
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb << myname << "(sysCommand): logRotate" << endl;
string fname = unideb.getLogFile();
ulog << myname << "(sysCommand): logRotate" << endl;
string fname( ulog.getLogFile() );
if( !fname.empty() )
{
unideb.logFile(fname);
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
ulog.logFile(fname);
ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
}
unideb << myname << "(sysCommand): logRotate" << endl;
fname = unideb.getLogFile();
dlog << myname << "(sysCommand): logRotate" << endl;
fname = dlog.getLogFile();
if( !fname.empty() )
{
unideb.logFile(fname);
unideb << myname << "(sysCommand): ***************** GGDEB LOG ROTATE *****************" << endl;
dlog.logFile(fname);
dlog << myname << "(sysCommand): ***************** GGDEB LOG ROTATE *****************" << endl;
}
}
break;
......@@ -1323,7 +1341,7 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
<< "(askSensors): Не дождались готовности(work) SharedMemory к работе в течение "
<< activateTimeout << " мсек";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
throw SystemError(err.str());
}
......@@ -1331,14 +1349,15 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
PassiveTimer ptAct(activateTimeout);
while( !readconf_ok && !ptAct.checkTime() )
{
cout << myname << "(askSensors): wait read configuration..." << endl;
if( dlog.is_info() )
dlog.info() << myname << "(askSensors): wait read configuration..." << endl;
msleep(50);
if( readconf_ok )
break;
}
if( !readconf_ok )
dlog[Debug::CRIT] << myname << "(askSensors): ************* don`t read configuration?! ************" << endl;
if( !readconf_ok && dlog.is_crit() )
dlog.crit() << myname << "(askSensors): ************* don`t read configuration?! ************" << endl;
try
{
......@@ -1347,7 +1366,8 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
}
catch( Exception& ex)
{
dlog[Debug::CRIT] << myname << "(askSensors): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(askSensors): " << ex << endl;
}
try
......@@ -1357,7 +1377,8 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
}
catch( Exception& ex)
{
dlog[Debug::CRIT] << myname << "(askSensors): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(askSensors): " << ex << endl;
}
for( IOMap::iterator it=iomap.begin(); it!=iomap.end(); ++it )
......@@ -1379,7 +1400,8 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
}
catch( Exception& ex)
{
dlog[Debug::CRIT] << myname << "(askSensors): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(askSensors): " << ex << endl;
}
}
}
......@@ -1387,9 +1409,9 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
// -----------------------------------------------------------------------------
void IOControl::sensorInfo( UniSetTypes::SensorMessage* sm )
{
if( unideb.debugging(Debug::LEVEL1) )
if( dlog.is_level1() )
{
dlog[Debug::LEVEL1] << myname << "(sensorInfo): sm->id=" << sm->id
dlog.level1() << myname << "(sensorInfo): sm->id=" << sm->id
<< " val=" << sm->value << endl;
}
......@@ -1398,8 +1420,8 @@ void IOControl::sensorInfo( UniSetTypes::SensorMessage* sm )
if( sm->id == testLamp_S )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(sensorInfo): test_lamp=" << sm->value << endl;
if( dlog.is_info() )
dlog.info() << myname << "(sensorInfo): test_lamp=" << sm->value << endl;
isTestLamp = (bool)sm->value;
}
else if( sm->id == testMode_as )
......@@ -1412,9 +1434,9 @@ void IOControl::sensorInfo( UniSetTypes::SensorMessage* sm )
{
if( it->si.id == sm->id )
{
if( unideb.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(sensorInfo): sid=" << sm->id
dlog.info() << myname << "(sensorInfo): sid=" << sm->id
<< " value=" << sm->value
<< endl;
}
......@@ -1514,9 +1536,9 @@ void IOControl::sensorInfo( UniSetTypes::SensorMessage* sm )
}
else if( it->stype == UniversalIO::DO )
{
if( unideb.debugging(Debug::LEVEL1) )
if( dlog.is_level1() )
{
dlog[Debug::LEVEL1] << myname << "(sensorInfo): DO: sm->id=" << sm->id
dlog.level1() << myname << "(sensorInfo): DO: sm->id=" << sm->id
<< " val=" << sm->value << endl;
}
uniset_rwmutex_wrlock lock(it->val_lock);
......@@ -1541,7 +1563,7 @@ void IOControl::waitSM()
err << myname << "(execute): did not wait for the ready 'SharedMemory'. Timeout "
<< smReadyTimeout << " msec";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -1551,14 +1573,16 @@ void IOControl::buildCardsList()
xmlNode* nnode = conf->getXMLNodesSection();
if( !nnode )
{
dlog[Debug::WARN] << myname << "(buildCardsList): <nodes> not found?!" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(buildCardsList): <nodes> not found?!" << endl;
return;
}
UniXML* xml = conf->getConfXML();
if( !xml )
{
dlog[Debug::WARN] << myname << "(buildCardsList): xml=NULL?!" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(buildCardsList): xml=NULL?!" << endl;
return;
}
......@@ -1576,7 +1600,8 @@ void IOControl::buildCardsList()
if( !mynode )
{
dlog[Debug::WARN] << myname << "(buildCardsList): node='" << conf->getLocalNodeName() << "' not found.." << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(buildCardsList): node='" << conf->getLocalNodeName() << "' not found.." << endl;
return;
}
......@@ -1586,14 +1611,16 @@ void IOControl::buildCardsList()
if( !cnode )
{
dlog[Debug::WARN] << myname << "(buildCardsList): Not found <iocards> for node=" << conf->getLocalNodeName() << "(" << conf->getLocalNode() << ")" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(buildCardsList): Not found <iocards> for node=" << conf->getLocalNodeName() << "(" << conf->getLocalNode() << ")" << endl;
return;
}
UniXML_iterator it(cnode);
if( !it.goChildren() )
{
dlog[Debug::WARN] << myname << "(buildCardsList): <iocards> empty.." << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(buildCardsList): <iocards> empty.." << endl;
return;
}
......@@ -1611,21 +1638,24 @@ void IOControl::buildCardsList()
if( cardnum <=0 )
{
dlog[Debug::LEVEL3] << myname << "(init): Unknown card number?! card=" << it.getIntProp("card") << "(" << cname << ")" << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(init): Unknown card number?! card=" << it.getIntProp("card") << "(" << cname << ")" << endl;
continue;
}
if( cardnum > maxCardNum )
{
dlog[Debug::LEVEL3] << myname << "(init): BAD card number card='" << it.getIntProp("card") << "'(" << cname << "). Must be < " << maxCardNum << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(init): BAD card number card='" << it.getIntProp("card") << "'(" << cname << "). Must be < " << maxCardNum << endl;
continue;
}
if( it.getIntProp("ignore") )
{
cards[cardnum] = NULL;
dlog[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
if( dlog.is_level3() )
dlog.level3() << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
<< " DISABLED! ignore=1" << endl;
continue;
}
......@@ -1636,7 +1666,8 @@ void IOControl::buildCardsList()
if( findArgParam( s.str(), conf->getArgc(), conf->getArgv()) != -1 )
{
cards[cardnum] = NULL;
dlog[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
if( dlog.is_level3() )
dlog.level3() << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
<< " DISABLED! (" << s.str() << ")" << endl;
continue;
}
......@@ -1646,13 +1677,15 @@ void IOControl::buildCardsList()
if( iodev.empty() || iodev == "/dev/null" )
{
cards[cardnum] = NULL;
dlog[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
if( dlog.is_level3() )
dlog.level3() << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
<< " DISABLED! iodev='"
<< iodev << "'" << endl;
continue;
}
dlog[Debug::LEVEL3] << myname << "(init): ADD card=" << it.getProp("card") << "(" << cname << ")" << " dev=" << iodev << endl;
if( dlog.is_level3() )
dlog.level3() << myname << "(init): ADD card=" << it.getProp("card") << "(" << cname << ")" << " dev=" << iodev << endl;
try
{
......@@ -1661,7 +1694,8 @@ void IOControl::buildCardsList()
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(buildCardsList): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(buildCardsList): " << ex << endl;
throw;
}
......@@ -1689,7 +1723,8 @@ void IOControl::buildCardsList()
string subdev_name( it.getProp(s.str()) );
if( subdev_name.empty() )
{
dlog[Debug::INFO] << myname << "(buidCardList): empty subdev. ignore... (" << s.str() << ")" << endl;
if( dlog.is_info() )
dlog.info() << myname << "(buidCardList): empty subdev. ignore... (" << s.str() << ")" << endl;
continue;
}
......@@ -1705,13 +1740,15 @@ void IOControl::buildCardsList()
if( st == ComediInterface::GRAYHILL )
{
// для Grayhill конфигурирование не требуется
dlog[Debug::INFO] << myname << "(buildCardsList): card=" << it.getProp("card")
if( dlog.is_info() )
dlog.info() << myname << "(buildCardsList): card=" << it.getProp("card")
<< "(" << cname << ")"
<< " init subdev" << i << " 'GRAYHILL'" << endl;
continue;
}
dlog[Debug::INFO] << myname << "(buildCardsList): card=" << it.getProp("card")
if( dlog.is_info() )
dlog.info() << myname << "(buildCardsList): card=" << it.getProp("card")
<< "(" << cname << ")"
<< " init subdev" << i << " " << it.getProp(s.str()) << endl;
cards[cardnum]->configureSubdev(i-1,st);
......
extensions/IOControl/iocontrol.cc
View file @ dc1fabfe
......@@ -28,7 +28,7 @@ int main(int argc, const char **argv)
string logfilename = conf->getArgParam("--io-logfile","iocontrol.log");
string logname( conf->getLogDir() + logfilename );
dlog.logFile( logname );
unideb.logFile( logname );
ulog.logFile( logname );
ObjectId shmID = DefaultObjectId;
string sID = conf->getArgParam("--smemory-id");
......@@ -48,7 +48,7 @@ int main(int argc, const char **argv)
IOControl* ic = IOControl::init_iocontrol(argc,argv,shmID);
if( !ic )
{
dlog[Debug::CRIT] << "(iocontrol): init не прошёл..." << endl;
dlog.crit() << "(iocontrol): init не прошёл..." << endl;
return 1;
}
......@@ -58,10 +58,10 @@ int main(int argc, const char **argv)
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- IOControl START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- IOControl START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- IOControl START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- IOControl START -------------------------\n\n";
act.run(true);
msleep(500);
ic->execute();
......@@ -69,15 +69,15 @@ int main(int argc, const char **argv)
}
catch(SystemError& err)
{
dlog[Debug::CRIT] << "(iocontrol): " << err << endl;
dlog.crit() << "(iocontrol): " << err << endl;
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << "(iocontrol): " << ex << endl;
dlog.crit() << "(iocontrol): " << ex << endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(iocontrol): catch(...)" << endl;
dlog.crit() << "(iocontrol): catch(...)" << endl;
}
return 1;
......
extensions/LogicProcessor/LProcessor.cc
View file @ dc1fabfe
......@@ -35,15 +35,15 @@ void LProcessor::execute( const string& lfile )
}
catch( LogicException& ex )
{
dlog[Debug::CRIT] << logname << "(execute): " << ex << endl;
dlog.crit() << logname << "(execute): " << ex << endl;
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << logname << "(execute): " << ex << endl;
dlog.crit() << logname << "(execute): " << ex << endl;
}
catch(...)
{
dlog[Debug::CRIT] << logname << "(execute): catch...\n";
dlog.crit() << logname << "(execute): catch...\n";
}
msleep(sleepTime);
}
......@@ -67,7 +67,7 @@ void LProcessor::build( const string& lfile )
UniSetTypes::ObjectId sid = conf->getSensorID(it->name);
if( sid == DefaultObjectId )
{
dlog[Debug::CRIT] << "НЕ НАЙДЕН ИДЕНТИФИКАТОР ДАТЧИКА: " << it->name << endl;
dlog.crit() << "НЕ НАЙДЕН ИДЕНТИФИКАТОР ДАТЧИКА: " << it->name << endl;
continue;
}
......@@ -78,7 +78,7 @@ void LProcessor::build( const string& lfile )
ei.iotype = conf->getIOType(sid);
if( ei.iotype == UniversalIO::UnknownIOType )
{
dlog[Debug::CRIT] << "Unkown iotype for sid=" << sid << "(" << it->name << ")" << endl;
dlog.crit() << "Unkown iotype for sid=" << sid << "(" << it->name << ")" << endl;
continue;
}
extInputs.push_front(ei);
......@@ -89,7 +89,7 @@ void LProcessor::build( const string& lfile )
UniSetTypes::ObjectId sid = conf->getSensorID(it->name);
if( sid == DefaultObjectId )
{
dlog[Debug::CRIT] << "НЕ НАЙДЕН ИДЕНТИФИКАТОР ВЫХОДА: " << it->name << endl;
dlog.crit() << "НЕ НАЙДЕН ИДЕНТИФИКАТОР ВЫХОДА: " << it->name << endl;
continue;
}
......@@ -99,7 +99,7 @@ void LProcessor::build( const string& lfile )
ei.iotype = conf->getIOType(sid);
if( ei.iotype == UniversalIO::UnknownIOType )
{
dlog[Debug::CRIT] << "Unkown iotype for sid=" << sid << "(" << it->name << ")" << endl;
dlog.crit() << "Unkown iotype for sid=" << sid << "(" << it->name << ")" << endl;
continue;
}
......@@ -147,11 +147,11 @@ void LProcessor::setOuts()
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(LProcessor::setOuts): " << ex << endl;
dlog.crit() << "(LProcessor::setOuts): " << ex << endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(LProcessor::setOuts): catch...\n";
dlog.crit() << "(LProcessor::setOuts): catch...\n";
}
}
}
......
extensions/LogicProcessor/PassiveLProcessor.cc
View file @ dc1fabfe
......@@ -24,7 +24,8 @@ PassiveLProcessor::PassiveLProcessor( std::string lfile, UniSetTypes::ObjectId o
{
ostringstream err;
err << myname << ": ID not found ('HeartBeat') for " << heart;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
......@@ -51,8 +52,8 @@ void PassiveLProcessor::step()
}
catch(Exception& ex )
{
dlog[Debug::CRIT] << myname
<< "(step): (hb) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(step): (hb) " << ex << std::endl;
}
if( sidHeartBeat!=DefaultObjectId && ptHeartBeat.checkTime() )
......@@ -64,8 +65,8 @@ void PassiveLProcessor::step()
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname
<< "(step): (hb) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(step): (hb) " << ex << std::endl;
}
}
......@@ -85,7 +86,8 @@ void PassiveLProcessor::askSensors( UniversalIO::UIOCommand cmd )
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(askSensors): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(askSensors): " << ex << endl;
throw SystemError(myname +"(askSensors): do not ask sensors" );
}
}
......@@ -113,7 +115,8 @@ void PassiveLProcessor::sysCommand( UniSetTypes::SystemMessage *sm )
{
if( !shm->waitSMready(smReadyTimeout) )
{
dlog[Debug::CRIT] << myname << "(ERR): SM not ready. Terminated... " << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(ERR): SM not ready. Terminated... " << endl;
raise(SIGTERM);
return;
}
......@@ -146,12 +149,12 @@ void PassiveLProcessor::sysCommand( UniSetTypes::SystemMessage *sm )
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb << myname << "(sysCommand): logRotate" << std::endl;
string fname = unideb.getLogFile();
ulog << myname << "(sysCommand): logRotate" << std::endl;
string fname (ulog.getLogFile() );
if( !fname.empty() )
{
unideb.logFile(fname);
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
ulog.logFile(fname);
ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
}
dlog << myname << "(sysCommand): logRotate" << std::endl;
......@@ -199,11 +202,11 @@ void PassiveLProcessor::setOuts()
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(setOuts): " << ex << endl;
dlog.crit() << myname << "(setOuts): " << ex << endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(setOuts): catch...\n";
dlog.crit() << myname << "(setOuts): catch...\n";
}
}
}
......@@ -218,11 +221,11 @@ void PassiveLProcessor::sigterm( int signo )
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(sigterm): " << ex << endl;
dlog.crit() << myname << "(sigterm): " << ex << endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(sigterm): catch...\n";
dlog.crit() << myname << "(sigterm): catch...\n";
}
}
}
......@@ -260,7 +263,7 @@ void PassiveLProcessor::processingMessage( UniSetTypes::VoidMessage* msg )
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(processingMessage): " << ex << endl;
dlog.crit() << myname << "(processingMessage): " << ex << endl;
}
}
// -----------------------------------------------------------------------------
extensions/LogicProcessor/Schema.cc
View file @ dc1fabfe
......@@ -110,8 +110,8 @@ void Schema::extlink( const string& name, Element::ElementID childID, int numIn
// -------------------------------------------------------------------------
Element* Schema::manage( Element* el )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "Schema: manage new element id=" << el->getId()
if( dlog.is_info() )
dlog.info() << "Schema: manage new element id=" << el->getId()
<< " type=" << el->getType()
<< " inputs=" << el->inCount() << endl;
......
extensions/LogicProcessor/TAND.cc
View file @ dc1fabfe
......@@ -47,8 +47,8 @@ void TAND::setIn( int num, bool state )
if( !brk )
myout = true;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << this << ": myout " << myout << endl;
if( dlog.is_info() )
dlog.info() << this << ": myout " << myout << endl;
if( prev != myout )
Element::setChildOut();
......
extensions/LogicProcessor/TDelay.cc
View file @ dc1fabfe
......@@ -30,8 +30,10 @@ void TDelay::setIn( int num, bool state )
{
pt.setTiming(0); // reset timer
myout = false;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << this << ": set " << myout << endl;
if( dlog.is_info() )
dlog.info() << this << ": set " << myout << endl;
if( prev != myout )
Element::setChildOut();
return;
......@@ -44,8 +46,10 @@ void TDelay::setIn( int num, bool state )
{
pt.setTiming(0); // reset timer
myout = true;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << this << ": set " << myout << endl;
if( dlog.is_info() )
dlog.info() << this << ": set " << myout << endl;
if( prev != myout )
Element::setChildOut();
return;
......@@ -54,8 +58,9 @@ void TDelay::setIn( int num, bool state )
// засекаем, если ещё не установлен таймер
if( !myout && !prev ) // т.е. !myout && prev != myout
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << this << ": set timer " << delay << " [msec]" << endl;
if( dlog.is_info() )
dlog.info() << this << ": set timer " << delay << " [msec]" << endl;
pt.setTiming(delay);
}
}
......@@ -66,8 +71,8 @@ void TDelay::tick()
{
myout = true;
pt.setTiming(0); // reset timer
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << getType() << "(" << myid << "): TIMER!!!! myout=" << myout << endl;
if( dlog.is_info() )
dlog.info() << getType() << "(" << myid << "): TIMER!!!! myout=" << myout << endl;
Element::setChildOut();
}
}
......
extensions/LogicProcessor/TNOT.cc
View file @ dc1fabfe
......@@ -22,8 +22,8 @@ void TNOT::setIn( int num, bool state )
bool prev = myout;
myout = !state;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << this << ": myout " << myout << endl;
if( dlog.is_info() )
dlog.info() << this << ": myout " << myout << endl;
if( prev != myout )
Element::setChildOut();
......
extensions/LogicProcessor/TOR.cc
View file @ dc1fabfe
......@@ -60,8 +60,9 @@ void TOR::setIn( int num, bool state )
if( !brk )
myout = false;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << this << ": myout " << myout << endl;
if( dlog.is_info() )
dlog.info() << this << ": myout " << myout << endl;
if( prev != myout )
Element::setChildOut();
}
......
extensions/LogicProcessor/logicproc.cc
View file @ dc1fabfe
......@@ -23,13 +23,13 @@ int main(int argc, const char **argv)
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
string schema = conf->getArgParam("--schema");
if( schema.empty() )
{
dlog[Debug::CRIT] << "schema-file not defined. Use --schema" << endl;
dlog.crit() << "schema-file not defined. Use --schema" << endl;
return 1;
}
......
extensions/LogicProcessor/plogicproc.cc
View file @ dc1fabfe
......@@ -25,7 +25,7 @@ int main(int argc, const char **argv)
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
string schema = conf->getArgParam("--schema");
......@@ -76,10 +76,10 @@ int main(int argc, const char **argv)
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- IOControl START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- IOControl START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- IOControl START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- IOControl START -------------------------\n\n";
act.run(false);
return 0;
}
......
extensions/ModbusMaster/MBExchange.cc
View file @ dc1fabfe
......@@ -52,7 +52,8 @@ pollActivated(false)
// определяем фильтр
s_field = conf->getArgParam("--" + prefix + "-filter-field");
s_fvalue = conf->getArgParam("--" + prefix + "-filter-value");
dlog[Debug::INFO] << myname << "(init): read fileter-field='" << s_field
if( dlog.is_info() )
dlog.info() << myname << "(init): read fileter-field='" << s_field
<< "' filter-value='" << s_fvalue << "'" << endl;
stat_time = conf->getArgPInt("--" + prefix + "-statistic-sec",it.getProp("statistic_sec"),0);
......@@ -75,7 +76,7 @@ pollActivated(false)
noQueryOptimization = conf->getArgInt("--" + prefix + "-no-query-optimization",it.getProp("no_query_optimization"));
mbregFromID = conf->getArgInt("--" + prefix + "-reg-from-id",it.getProp("reg_from_id"));
dlog[Debug::INFO] << myname << "(init): mbregFromID=" << mbregFromID << endl;
dlog.info() << myname << "(init): mbregFromID=" << mbregFromID << endl;
polltime = conf->getArgPInt("--" + prefix + "-polltime",it.getProp("polltime"), 100);
......@@ -96,7 +97,8 @@ pollActivated(false)
{
ostringstream err;
err << myname << ": ID not found ('HeartBeat') for " << heart;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
......@@ -116,12 +118,13 @@ pollActivated(false)
{
ostringstream err;
err << myname << "(init): test_id unknown. 'TestMode_S' not found...";
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
dlog[Debug::INFO] << myname << "(init): test_id=" << test_id << endl;
dlog.info() << myname << "(init): test_id=" << test_id << endl;
string emode = conf->getArgParam("--" + prefix + "-exchange-mode-id",it.getProp("exchangeModeID"));
if( !emode.empty() )
......@@ -131,7 +134,8 @@ pollActivated(false)
{
ostringstream err;
err << myname << ": ID not found ('ExchangeMode') for " << emode;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -196,7 +200,8 @@ void MBExchange::waitSMReady()
{
ostringstream err;
err << myname << "(waitSMReady): failed waiting SharedMemory " << ready_timeout << " msec";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -217,9 +222,8 @@ void MBExchange::step()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
<< "(step): (hb) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(step): (hb) " << ex << std::endl;
}
}
}
......@@ -239,8 +243,8 @@ void MBExchange::setProcActive( bool st )
// -----------------------------------------------------------------------------
void MBExchange::sigterm( int signo )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << ": ********* SIGTERM(" << signo << ") ********" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << ": ********* SIGTERM(" << signo << ") ********" << endl;
setProcActive(false);
UniSetObject_LT::sigterm(signo);
}
......@@ -259,8 +263,8 @@ void MBExchange::readConfiguration()
UniXML_iterator it(root);
if( !it.goChildren() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readConfiguration): раздел <sensors> не содержит секций ?!!\n";
if( dlog.is_crit() )
dlog.crit() << myname << "(readConfiguration): раздел <sensors> не содержит секций ?!!\n";
return;
}
......@@ -457,7 +461,7 @@ void MBExchange::rtuQueryOptimization( RTUDeviceMap& m )
if( noQueryOptimization )
return;
dlog[Debug::INFO] << myname << "(rtuQueryOptimization): optimization..." << endl;
dlog.info() << myname << "(rtuQueryOptimization): optimization..." << endl;
for( MBExchange::RTUDeviceMap::iterator it1=m.begin(); it1!=m.end(); ++it1 )
{
......@@ -494,8 +498,8 @@ void MBExchange::rtuQueryOptimization( RTUDeviceMap& m )
// check correct function...
if( beg->second->q_count>1 && beg->second->mbfunc==ModbusRTU::fnWriteOutputSingleRegister )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(rtuQueryOptimization): "
if( dlog.is_warn() )
dlog.warn() << myname << "(rtuQueryOptimization): "
<< " optimization change func=" << ModbusRTU::fnWriteOutputSingleRegister
<< " <--> func=" << ModbusRTU::fnWriteOutputRegisters
<< " for mbaddr=" << ModbusRTU::addr2str(d->mbaddr)
......@@ -505,8 +509,8 @@ void MBExchange::rtuQueryOptimization( RTUDeviceMap& m )
}
else if( beg->second->q_count>1 && beg->second->mbfunc==ModbusRTU::fnForceSingleCoil )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(rtuQueryOptimization): "
if( dlog.is_warn() )
dlog.warn() << myname << "(rtuQueryOptimization): "
<< " optimization change func=" << ModbusRTU::fnForceSingleCoil
<< " <--> func=" << ModbusRTU::fnForceMultipleCoils
<< " for mbaddr=" << ModbusRTU::addr2str(d->mbaddr)
......@@ -681,8 +685,8 @@ bool MBExchange::initSMValue( ModbusRTU::ModbusData* data, int count, RSProperty
return true;
}
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initSMValue): IGNORE item: rnum=" << p->rnum
if( dlog.is_crit() )
dlog.crit() << myname << "(initSMValue): IGNORE item: rnum=" << p->rnum
<< " > 1 ?!! for id=" << p->si.id << endl;
return false;
......@@ -715,8 +719,8 @@ bool MBExchange::initSMValue( ModbusRTU::ModbusData* data, int count, RSProperty
{
if( p->nbyte <= 0 || p->nbyte > VTypes::Byte::bsize )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initSMValue): IGNORE item: sid=" << ModbusRTU::dat2str(p->si.id)
if( dlog.is_crit() )
dlog.crit() << myname << "(initSMValue): IGNORE item: sid=" << ModbusRTU::dat2str(p->si.id)
<< " vtype=" << p->vType << " but nbyte=" << p->nbyte << endl;
return false;
}
......@@ -823,8 +827,8 @@ bool MBExchange::pollRTU( RTUDevice* dev, RegMap::iterator& it )
if( p->q_count == 0 )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(pollRTU): q_count=0 for mbreg=" << ModbusRTU::dat2str(p->mbreg)
if( dlog.is_info() )
dlog.info() << myname << "(pollRTU): q_count=0 for mbreg=" << ModbusRTU::dat2str(p->mbreg)
<< " IGNORE register..." << endl;
return false;
}
......@@ -881,8 +885,8 @@ bool MBExchange::pollRTU( RTUDevice* dev, RegMap::iterator& it )
{
if( p->q_count != 1 )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(pollRTU): mbreg=" << ModbusRTU::dat2str(p->mbreg)
if( dlog.is_crit() )
dlog.crit() << myname << "(pollRTU): mbreg=" << ModbusRTU::dat2str(p->mbreg)
<< " IGNORE WRITE SINGLE REGISTER (0x06) q_count=" << p->q_count << " ..." << endl;
return false;
}
......@@ -941,8 +945,8 @@ bool MBExchange::pollRTU( RTUDevice* dev, RegMap::iterator& it )
{
if( p->q_count != 1 )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(pollRTU): mbreg=" << ModbusRTU::dat2str(p->mbreg)
if( dlog.is_crit() )
dlog.crit() << myname << "(pollRTU): mbreg=" << ModbusRTU::dat2str(p->mbreg)
<< " IGNORE FORCE SINGLE COIL (0x05) q_count=" << p->q_count << " ..." << endl;
return false;
}
......@@ -981,8 +985,8 @@ bool MBExchange::pollRTU( RTUDevice* dev, RegMap::iterator& it )
default:
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(pollRTU): mbreg=" << ModbusRTU::dat2str(p->mbreg)
if( dlog.is_warn() )
dlog.warn() << myname << "(pollRTU): mbreg=" << ModbusRTU::dat2str(p->mbreg)
<< " IGNORE mfunc=" << (int)p->mbfunc << " ..." << endl;
return false;
}
......@@ -1188,8 +1192,8 @@ void MBExchange::updateRSProperty( RSProperty* p, bool write_only )
return;
}
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(updateRSProperty): IGNORE item: rnum=" << p->rnum
if( dlog.is_crit() )
dlog.crit() << myname << "(updateRSProperty): IGNORE item: rnum=" << p->rnum
<< " > 1 ?!! for id=" << p->si.id << endl;
return;
}
......@@ -1259,8 +1263,8 @@ void MBExchange::updateRSProperty( RSProperty* p, bool write_only )
{
if( p->nbyte <= 0 || p->nbyte > VTypes::Byte::bsize )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(updateRSProperty): IGNORE item: reg=" << ModbusRTU::dat2str(r->mbreg)
if( dlog.is_crit() )
dlog.crit() << myname << "(updateRSProperty): IGNORE item: reg=" << ModbusRTU::dat2str(r->mbreg)
<< " vtype=" << p->vType << " but nbyte=" << p->nbyte << endl;
return;
}
......@@ -1500,8 +1504,8 @@ void MBExchange::updateMTR( RegMap::iterator& rit )
{
if( save )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(updateMTR): write (T4) reg(" << dat2str(r->mbreg) << ") to MTR NOT YET!!!" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(updateMTR): write (T4) reg(" << dat2str(r->mbreg) << ") to MTR NOT YET!!!" << endl;
}
else
{
......@@ -1778,16 +1782,16 @@ MBExchange::RTUDevice* MBExchange::addDev( RTUDeviceMap& mp, ModbusRTU::ModbusAd
DeviceType dtype = getDeviceType(xmlit.getProp(prop_prefix + "mbtype"));
if( it->second->dtype != dtype )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(addDev): OTHER mbtype=" << dtype << " for " << xmlit.getProp("name")
if( dlog.is_crit() )
dlog.crit() << myname << "(addDev): OTHER mbtype=" << dtype << " for " << xmlit.getProp("name")
<< ". Already used devtype=" << it->second->dtype
<< " for mbaddr=" << ModbusRTU::addr2str(it->second->mbaddr)
<< endl;
return 0;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(addDev): device for addr=" << ModbusRTU::addr2str(a)
if( dlog.is_info() )
dlog.info() << myname << "(addDev): device for addr=" << ModbusRTU::addr2str(a)
<< " already added. Ignore device params for " << xmlit.getProp("name") << " ..." << endl;
return it->second;
}
......@@ -1814,22 +1818,22 @@ MBExchange::RegInfo* MBExchange::addReg( RegMap& mp, RegID id, ModbusRTU::Modbus
{
if( !it->second->dev )
{
dlog[Debug::CRIT] << myname << "(addReg): for " << xmlit.getProp("name")
dlog.crit() << myname << "(addReg): for " << xmlit.getProp("name")
<< " dev=0!!!! " << endl;
return 0;
}
if( it->second->dev->dtype != dev->dtype )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(addReg): OTHER mbtype=" << dev->dtype << " for " << xmlit.getProp("name")
if( dlog.is_crit() )
dlog.crit() << myname << "(addReg): OTHER mbtype=" << dev->dtype << " for " << xmlit.getProp("name")
<< ". Already used devtype=" << it->second->dev->dtype << " for " << it->second->dev << endl;
return 0;
}
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(addReg): reg=" << ModbusRTU::dat2str(r)
dlog.info() << myname << "(addReg): reg=" << ModbusRTU::dat2str(r)
<< "(id=" << id << ")"
<< " already added for " << (*it->second)
<< " Ignore register params for " << xmlit.getProp("name") << " ..." << endl;
......@@ -1900,8 +1904,8 @@ bool MBExchange::initRSProperty( RSProperty& p, UniXML_iterator& it )
p.stype = UniSetTypes::getIOType(stype);
if( p.stype == UniversalIO::UnknownIOType )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(IOBase::readItem): неизвестный iotype=: "
if( dlog.is_crit() )
dlog.crit() << myname << "(IOBase::readItem): неизвестный iotype=: "
<< stype << " for " << it.getProp("name") << endl;
return false;
}
......@@ -1913,8 +1917,8 @@ bool MBExchange::initRSProperty( RSProperty& p, UniXML_iterator& it )
p.nbit = UniSetTypes::uni_atoi(sbit.c_str());
if( p.nbit < 0 || p.nbit >= ModbusRTU::BitsPerData )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRSProperty): BAD nbit=" << p.nbit
if( dlog.is_crit() )
dlog.crit() << myname << "(initRSProperty): BAD nbit=" << p.nbit
<< ". (0 >= nbit < " << ModbusRTU::BitsPerData <<")." << endl;
return false;
}
......@@ -1924,8 +1928,8 @@ bool MBExchange::initRSProperty( RSProperty& p, UniXML_iterator& it )
( p.stype == UniversalIO::AI ||
p.stype == UniversalIO::AO ) )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(initRSProperty): (ignore) uncorrect param`s nbit>1 (" << p.nbit << ")"
if( dlog.is_warn() )
dlog.warn() << "(initRSProperty): (ignore) uncorrect param`s nbit>1 (" << p.nbit << ")"
<< " but iotype=" << p.stype << " for " << it.getProp("name") << endl;
}
......@@ -1935,8 +1939,8 @@ bool MBExchange::initRSProperty( RSProperty& p, UniXML_iterator& it )
p.nbyte = UniSetTypes::uni_atoi(sbyte.c_str());
if( p.nbyte < 0 || p.nbyte > VTypes::Byte::bsize )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRSProperty): BAD nbyte=" << p.nbyte
if( dlog.is_crit() )
dlog.crit() << myname << "(initRSProperty): BAD nbyte=" << p.nbyte
<< ". (0 >= nbyte < " << VTypes::Byte::bsize << ")." << endl;
return false;
}
......@@ -1953,8 +1957,8 @@ bool MBExchange::initRSProperty( RSProperty& p, UniXML_iterator& it )
VTypes::VType v(VTypes::str2type(vt));
if( v == VTypes::vtUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRSProperty): Unknown tcp_vtype='" << vt << "' for "
if( dlog.is_crit() )
dlog.crit() << myname << "(initRSProperty): Unknown tcp_vtype='" << vt << "' for "
<< it.getProp("name")
<< endl;
......@@ -1975,7 +1979,7 @@ bool MBExchange::initRegInfo( RegInfo* r, UniXML_iterator& it, MBExchange::RTUD
if( dev->dtype == MBExchange::dtRTU )
{
// dlog[Debug::INFO] << myname << "(initRegInfo): init RTU.."
// dlog.info() << myname << "(initRegInfo): init RTU.."
}
else if( dev->dtype == MBExchange::dtMTR )
{
......@@ -2000,8 +2004,8 @@ bool MBExchange::initRegInfo( RegInfo* r, UniXML_iterator& it, MBExchange::RTUD
}
else
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRegInfo): Unknown mbtype='" << dev->dtype
if( dlog.is_crit() )
dlog.crit() << myname << "(initRegInfo): Unknown mbtype='" << dev->dtype
<< "' for " << it.getProp("name") << endl;
return false;
}
......@@ -2018,8 +2022,8 @@ bool MBExchange::initRegInfo( RegInfo* r, UniXML_iterator& it, MBExchange::RTUD
string sr = it.getProp(prop_prefix + "mbreg");
if( sr.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Unknown 'mbreg' for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Unknown 'mbreg' for " << it.getProp("name") << endl;
return false;
}
r->mbreg = ModbusRTU::str2mbData(sr);
......@@ -2032,8 +2036,8 @@ bool MBExchange::initRegInfo( RegInfo* r, UniXML_iterator& it, MBExchange::RTUD
r->mbfunc = (ModbusRTU::SlaveFunctionCode)UniSetTypes::uni_atoi(f.c_str());
if( r->mbfunc == ModbusRTU::fnUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRegInfo): Unknown mbfunc ='" << f
if( dlog.is_crit() )
dlog.crit() << myname << "(initRegInfo): Unknown mbfunc ='" << f
<< "' for " << it.getProp("name") << endl;
return false;
}
......@@ -2048,8 +2052,8 @@ bool MBExchange::initRTUDevice( RTUDevice* d, UniXML_iterator& it )
if( d->dtype == dtUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRTUDevice): Unknown tcp_mbtype=" << it.getProp(prop_prefix + "mbtype")
if( dlog.is_crit() )
dlog.crit() << myname << "(initRTUDevice): Unknown tcp_mbtype=" << it.getProp(prop_prefix + "mbtype")
<< ". Use: rtu "
<< " for " << it.getProp("name") << endl;
return false;
......@@ -2058,8 +2062,8 @@ bool MBExchange::initRTUDevice( RTUDevice* d, UniXML_iterator& it )
string addr = it.getProp(prop_prefix + "mbaddr");
if( addr.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initRTUDevice): Unknown mbaddr for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initRTUDevice): Unknown mbaddr for " << it.getProp("name") << endl;
return false;
}
......@@ -2083,8 +2087,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
string addr(it.getProp(prop_prefix + "mbaddr"));
if( addr.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Unknown mbaddr(" << prop_prefix << "mbaddr)='" << addr << "' for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Unknown mbaddr(" << prop_prefix << "mbaddr)='" << addr << "' for " << it.getProp("name") << endl;
return false;
}
......@@ -2093,8 +2097,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
RTUDevice* dev = addDev(rmap,mbaddr,it);
if( !dev )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): " << it.getProp("name") << " CAN`T ADD for polling!" << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): " << it.getProp("name") << " CAN`T ADD for polling!" << endl;
return false;
}
......@@ -2106,8 +2110,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
RegInfo r_tmp;
if( !initRTU188item(it, &r_tmp) )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): init RTU188 failed for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): init RTU188 failed for " << it.getProp("name") << endl;
return false;
}
......@@ -2123,8 +2127,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
string reg = it.getProp(prop_prefix + "mbreg");
if( reg.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): unknown mbreg(" << prop_prefix << ") for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): unknown mbreg(" << prop_prefix << ") for " << it.getProp("name") << endl;
return false;
}
mbreg = ModbusRTU::str2mbData(reg);
......@@ -2144,8 +2148,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
p.rnum = MTR::wsize(ri->mtrType);
if( p.rnum <= 0 )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): unknown word size for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): unknown word size for " << it.getProp("name") << endl;
return false;
}
}
......@@ -2169,8 +2173,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
{
if( p.nbit<0 && ri->slst.size() > 1 )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): FAILED! Sharing SAVE (not bit saving) to "
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): FAILED! Sharing SAVE (not bit saving) to "
<< " tcp_mbreg=" << ModbusRTU::dat2str(ri->mbreg)
<< " for " << it.getProp("name") << endl;
......@@ -2183,8 +2187,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
PList::iterator it2 = ri->slst.begin();
if( it2->nbit < 0 )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): FAILED! Sharing SAVE (mbreg="
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): FAILED! Sharing SAVE (mbreg="
<< ModbusRTU::dat2str(ri->mbreg) << " already used)!"
<< " IGNORE --> " << it.getProp("name") << endl;
abort(); // ABORT PROGRAM!!!!
......@@ -2233,8 +2237,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
if( ri->mbfunc != ModbusRTU::fnWriteOutputRegisters &&
ri->mbfunc != ModbusRTU::fnForceMultipleCoils )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Bad write function ='" << ModbusRTU::fnWriteOutputSingleRegister
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Bad write function ='" << ModbusRTU::fnWriteOutputSingleRegister
<< "' for vtype='" << p1->vType << "'"
<< " tcp_mbreg=" << ModbusRTU::dat2str(ri->mbreg)
<< " for " << it.getProp("name") << endl;
......@@ -2267,8 +2271,8 @@ bool MBExchange::initItem( UniXML_iterator& it )
ii.mbfunc = (ModbusRTU::SlaveFunctionCode)UniSetTypes::uni_atoi(s_mbfunc);
if( ii.mbfunc == ModbusRTU::fnUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Unknown tcp_init_mbfunc ='" << s_mbfunc
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Unknown tcp_init_mbfunc ='" << s_mbfunc
<< "' for " << it.getProp("name") << endl;
return false;
}
......@@ -2312,8 +2316,8 @@ bool MBExchange::initMTRitem( UniXML_iterator& it, RegInfo* p )
p->mtrType = MTR::str2type(it.getProp(prop_prefix + "mtrtype"));
if( p->mtrType == MTR::mtUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readMTRItem): Unknown mtrtype '"
if( dlog.is_crit() )
dlog.crit() << myname << "(readMTRItem): Unknown mtrtype '"
<< it.getProp(prop_prefix + "mtrtype")
<< "' for " << it.getProp("name") << endl;
......@@ -2330,24 +2334,24 @@ bool MBExchange::initRTU188item( UniXML_iterator& it, RegInfo* p )
if( jack.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readRTU188Item): Unknown " << prop_prefix << "jack='' "
if( dlog.is_crit() )
dlog.crit() << myname << "(readRTU188Item): Unknown " << prop_prefix << "jack='' "
<< " for " << it.getProp("name") << endl;
return false;
}
p->rtuJack = RTUStorage::s2j(jack);
if( p->rtuJack == RTUStorage::nUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readRTU188Item): Unknown " << prop_prefix << "jack=" << jack
if( dlog.is_crit() )
dlog.crit() << myname << "(readRTU188Item): Unknown " << prop_prefix << "jack=" << jack
<< " for " << it.getProp("name") << endl;
return false;
}
if( chan.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readRTU188Item): Unknown channel='' "
if( dlog.is_crit() )
dlog.crit() << myname << "(readRTU188Item): Unknown channel='' "
<< " for " << it.getProp("name") << endl;
return false;
}
......@@ -2423,11 +2427,11 @@ void MBExchange::initDeviceList()
initDeviceInfo(rmap,a,it1);
}
}
else if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(init): <DeviceList> empty section..." << endl;
else if( dlog.is_warn() )
dlog.warn() << myname << "(init): <DeviceList> empty section..." << endl;
}
else if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(init): <DeviceList> not found..." << endl;
else if( dlog.is_warn() )
dlog.warn() << myname << "(init): <DeviceList> not found..." << endl;
}
// -----------------------------------------------------------------------------
bool MBExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXML_iterator& it )
......@@ -2435,15 +2439,15 @@ bool MBExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXM
RTUDeviceMap::iterator d = m.find(a);
if( d == m.end() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(initDeviceInfo): not found device for addr=" << ModbusRTU::addr2str(a) << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(initDeviceInfo): not found device for addr=" << ModbusRTU::addr2str(a) << endl;
return false;
}
d->second->ask_every_reg = it.getIntProp("ask_every_reg");
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(initDeviceInfo): add addr=" << ModbusRTU::addr2str(a)
if( dlog.is_info() )
dlog.info() << myname << "(initDeviceInfo): add addr=" << ModbusRTU::addr2str(a)
<< " ask_every_reg=" << d->second->ask_every_reg << endl;
string s(it.getProp("respondSensor"));
......@@ -2452,8 +2456,8 @@ bool MBExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXM
d->second->resp_id = conf->getSensorID(s);
if( d->second->resp_id == DefaultObjectId )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initDeviceInfo): not found ID for respondSensor=" << s << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initDeviceInfo): not found ID for respondSensor=" << s << endl;
return false;
}
}
......@@ -2464,22 +2468,23 @@ bool MBExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXM
d->second->mode_id = conf->getSensorID(mod);
if( d->second->mode_id == DefaultObjectId )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initDeviceInfo): not found ID for modeSensor=" << mod << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initDeviceInfo): not found ID for modeSensor=" << mod << endl;
return false;
}
UniversalIO::IOType m_iotype = conf->getIOType(d->second->mode_id);
if( m_iotype != UniversalIO::AI )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initDeviceInfo): modeSensor='" << mod << "' must be 'AI'" << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initDeviceInfo): modeSensor='" << mod << "' must be 'AI'" << endl;
return false;
}
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(initDeviceInfo): add addr=" << ModbusRTU::addr2str(a) << endl;
if( dlog.is_info() )
dlog.info() << myname << "(initDeviceInfo): add addr=" << ModbusRTU::addr2str(a) << endl;
int tout = it.getPIntProp("timeout",5000);
d->second->resp_ptTimeout.setTiming(tout);
d->second->resp_invert = it.getIntProp("invert");
......@@ -2537,19 +2542,19 @@ void MBExchange::processingMessage(UniSetTypes::VoidMessage *msg)
}
catch( SystemError& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(SystemError): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(SystemError): " << ex << std::endl;
// throw SystemError(ex);
}
catch( Exception& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(processingMessage): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): " << ex << std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(processingMessage): catch ...\n";
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): catch ...\n";
}
}
// -----------------------------------------------------------------------------
......@@ -2561,14 +2566,14 @@ void MBExchange::sysCommand( UniSetTypes::SystemMessage *sm )
{
if( rmap.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(sysCommand): ************* ITEM MAP EMPTY! terminated... *************" << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(sysCommand): ************* ITEM MAP EMPTY! terminated... *************" << endl;
raise(SIGTERM);
return;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(sysCommand): device map size= " << rmap.size() << endl;
if( dlog.is_info() )
dlog.info() << myname << "(sysCommand): device map size= " << rmap.size() << endl;
if( !shm->isLocalwork() )
initDeviceList();
......@@ -2588,7 +2593,7 @@ void MBExchange::sysCommand( UniSetTypes::SystemMessage *sm )
}
if( !activated && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
dlog.crit() << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
{
UniSetTypes::uniset_rwmutex_rlock l(mutex_start);
......@@ -2633,12 +2638,12 @@ void MBExchange::sysCommand( UniSetTypes::SystemMessage *sm )
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb << myname << "(sysCommand): logRotate" << std::endl;
string fname = unideb.getLogFile();
ulog << myname << "(sysCommand): logRotate" << std::endl;
string fname(ulog.getLogFile());
if( !fname.empty() )
{
unideb.logFile(fname);
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
ulog.logFile(fname);
ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
}
dlog << myname << "(sysCommand): logRotate" << std::endl;
fname = dlog.getLogFile();
......@@ -2668,7 +2673,7 @@ void MBExchange::askSensors( UniversalIO::UIOCommand cmd )
<< "(askSensors): Не дождались готовности(work) SharedMemory к работе в течение "
<< activateTimeout << " мсек";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
throw SystemError(err.str());
}
......@@ -2680,13 +2685,13 @@ void MBExchange::askSensors( UniversalIO::UIOCommand cmd )
}
catch( UniSetTypes::Exception& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): " << ex << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): " << ex << std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): 'sidExchangeMode' catch..." << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): 'sidExchangeMode' catch..." << std::endl;
}
for( MBExchange::RTUDeviceMap::iterator it1=rmap.begin(); it1!=rmap.end(); ++it1 )
......@@ -2700,13 +2705,13 @@ void MBExchange::askSensors( UniversalIO::UIOCommand cmd )
}
catch( UniSetTypes::Exception& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): " << ex << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): " << ex << std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): (mode_id=" << d->mode_id << ").. catch..." << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): (mode_id=" << d->mode_id << ").. catch..." << std::endl;
}
if( force_out )
......@@ -2725,13 +2730,13 @@ void MBExchange::askSensors( UniversalIO::UIOCommand cmd )
}
catch( UniSetTypes::Exception& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): " << ex << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): " << ex << std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): id=" << i->si.id << " catch..." << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): id=" << i->si.id << " catch..." << std::endl;
}
}
}
......@@ -2767,9 +2772,9 @@ void MBExchange::sensorInfo( UniSetTypes::SensorMessage* sm )
{
if( sm->id == i->si.id && sm->node == i->si.node )
{
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname<< "(sensorInfo): si.id=" << sm->id
dlog.info() << myname<< "(sensorInfo): si.id=" << sm->id
<< " reg=" << ModbusRTU::dat2str(i->reg->mbreg)
<< " val=" << sm->value
<< " mb_initOK=" << i->reg->mb_initOK << endl;
......@@ -2935,8 +2940,8 @@ void MBExchange::poll()
if( allNotRespond && ptReopen.checkTime() )
{
uniset_mutex_lock l(pollMutex, 300);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << ": REOPEN timeout..(" << ptReopen.getInterval() << ")" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << ": REOPEN timeout..(" << ptReopen.getInterval() << ")" << endl;
mb = initMB(true);
ptReopen.reset();
......@@ -3009,8 +3014,8 @@ void MBExchange::updateRespondSensors()
}
catch( Exception& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(step): (respond) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(step): (respond) " << ex << std::endl;
}
}
}
......@@ -3036,13 +3041,13 @@ void MBExchange::execute()
}
catch( Exception& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(execute): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(execute): " << ex << std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(execute): catch ..." << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(execute): catch ..." << endl;
}
msleep(polltime);
......
extensions/ModbusMaster/MBTCPMaster.cc
View file @ dc1fabfe
......@@ -38,7 +38,7 @@ pollThread(0)
prop_prefix = "";
}
dlog[Debug::INFO] << myname << "(init): prop_prefix=" << prop_prefix << endl;
dlog.info() << myname << "(init): prop_prefix=" << prop_prefix << endl;
UniXML_iterator it(cnode);
......@@ -55,7 +55,7 @@ pollThread(0)
force_disconnect = conf->getArgInt("--" + prefix + "-persistent-connection",it.getProp("persistent_connection")) ? false : true;
dlog[Debug::INFO] << myname << "(init): persisten-connection=" << (!force_disconnect) << endl;
dlog.info() << myname << "(init): persisten-connection=" << (!force_disconnect) << endl;
if( shm->isLocalwork() )
{
......@@ -68,7 +68,7 @@ pollThread(0)
pollThread = new ThreadCreator<MBTCPMaster>(this, &MBTCPMaster::poll_thread);
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
printMap(rmap);
}
// -----------------------------------------------------------------------------
......@@ -106,16 +106,16 @@ ModbusClient* MBTCPMaster::initMB( bool reopen )
mbtcp->setAfterSendPause(aftersend_pause);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): ipaddr=" << iaddr << " port=" << port << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): ipaddr=" << iaddr << " port=" << port << endl;
if( dlog.debugging(Debug::LEVEL9) )
mbtcp->setLog(dlog);
}
catch( ModbusRTU::mbException& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(init): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << "(init): " << ex << endl;
}
catch(...)
{
......@@ -183,7 +183,7 @@ MBTCPMaster* MBTCPMaster::init_mbmaster( int argc, const char* const* argv,
if( name.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(MBTCPMaster): Не задан name'" << endl;
dlog.crit() << "(MBTCPMaster): Не задан name'" << endl;
return 0;
}
......@@ -191,14 +191,14 @@ MBTCPMaster* MBTCPMaster::init_mbmaster( int argc, const char* const* argv,
if( ID == UniSetTypes::DefaultObjectId )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(MBTCPMaster): идентификатор '" << name
dlog.crit() << "(MBTCPMaster): идентификатор '" << name
<< "' не найден в конф. файле!"
<< " в секции " << conf->getObjectsSection() << endl;
return 0;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(MBTCPMaster): name = " << name << "(" << ID << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(MBTCPMaster): name = " << name << "(" << ID << ")" << endl;
return new MBTCPMaster(ID,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
extensions/ModbusMaster/MBTCPMultiMaster.cc
View file @ dc1fabfe
......@@ -40,7 +40,8 @@ checkThread(0)
prop_prefix = "";
}
dlog[Debug::INFO] << myname << "(init): prop_prefix=" << prop_prefix << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): prop_prefix=" << prop_prefix << endl;
UniXML_iterator it(cnode);
......@@ -52,7 +53,8 @@ checkThread(0)
{
ostringstream err;
err << myname << "(init): not found <GateList>";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
......@@ -60,7 +62,8 @@ checkThread(0)
{
ostringstream err;
err << myname << "(init): empty <GateList> ?!";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
......@@ -72,7 +75,8 @@ checkThread(0)
{
ostringstream err;
err << myname << "(init): ip='' in <GateList>";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
......@@ -81,7 +85,8 @@ checkThread(0)
{
ostringstream err;
err << myname << "(init): ERROR: port=''" << sinf.port << " for ip='" << sinf.ip << "' in <GateList>";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
......@@ -92,7 +97,8 @@ checkThread(0)
{
ostringstream err;
err << myname << "(init): ERROR: Unknown SensorID for '" << it1.getProp("respond") << "' in <GateList>";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
}
......@@ -116,15 +122,16 @@ checkThread(0)
mblist.push_back(sinf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): add slave channel " << sinf.myname << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): add slave channel " << sinf.myname << endl;
}
if( mblist.empty() )
{
ostringstream err;
err << myname << "(init): empty <GateList>!";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
......@@ -148,8 +155,7 @@ checkThread(0)
// неудачной попытки запросов по одному из каналов, то ПЕРЕОПРЕДЕЛЯЕМ reopen, на timeout..
ptReopen.setTiming(ptTimeout.getInterval());
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
printMap(rmap);
}
// -----------------------------------------------------------------------------
......@@ -228,8 +234,8 @@ bool MBTCPMultiMaster::MBSlaveInfo::init()
{
// ost::Thread::setException(ost::Thread::throwException);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): connect..." << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): connect..." << endl;
mbtcp->connect(ip,port);
mbtcp->setForceDisconnect(force_disconnect);
......@@ -242,8 +248,8 @@ bool MBTCPMultiMaster::MBSlaveInfo::init()
mbtcp->setSleepPause(sleepPause_usec);
mbtcp->setAfterSendPause(aftersend_pause);
if( mbtcp->isConnection() && dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(init): " << myname << " connect OK" << endl;
if( mbtcp->isConnection() && dlog.is_info() )
dlog.info() << "(init): " << myname << " connect OK" << endl;
initOK = true;
}
......@@ -251,13 +257,13 @@ bool MBTCPMultiMaster::MBSlaveInfo::init()
}
catch( ModbusRTU::mbException& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(init): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << "(init): " << ex << endl;
}
catch(...)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(init): " << myname << " catch ..." << endl;
if( dlog.is_warn() )
dlog.warn() << "(init): " << myname << " catch ..." << endl;
}
initOK = false;
......@@ -312,8 +318,8 @@ void MBTCPMultiMaster::check_thread()
try
{
bool r = it->check();
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(check): " << it->myname << " " << ( r ? "OK" : "FAIL" ) << endl;
if( dlog.is_info() )
dlog.info() << myname << "(check): " << it->myname << " " << ( r ? "OK" : "FAIL" ) << endl;
try
{
......@@ -326,7 +332,7 @@ void MBTCPMultiMaster::check_thread()
catch( Exception& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(check): (respond) " << ex << std::endl;
dlog.crit() << myname << "(check): (respond) " << ex << std::endl;
}
catch(...){}
......@@ -376,20 +382,20 @@ MBTCPMultiMaster* MBTCPMultiMaster::init_mbmaster( int argc, const char* const*
string name = conf->getArgParam("--" + prefix + "-name","MBTCPMultiMaster1");
if( name.empty() )
{
dlog[Debug::CRIT] << "(MBTCPMultiMaster): Не задан name'" << endl;
dlog.crit() << "(MBTCPMultiMaster): Не задан name'" << endl;
return 0;
}
ObjectId ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId )
{
dlog[Debug::CRIT] << "(MBTCPMultiMaster): идентификатор '" << name
dlog.crit() << "(MBTCPMultiMaster): идентификатор '" << name
<< "' не найден в конф. файле!"
<< " в секции " << conf->getObjectsSection() << endl;
return 0;
}
dlog[Debug::INFO] << "(MBTCPMultiMaster): name = " << name << "(" << ID << ")" << endl;
dlog.info() << "(MBTCPMultiMaster): name = " << name << "(" << ID << ")" << endl;
return new MBTCPMultiMaster(ID,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
extensions/ModbusMaster/RTUExchange.cc
View file @ dc1fabfe
......@@ -38,7 +38,7 @@ rs_pre_clean(false)
prop_prefix = "";
}
dlog[Debug::INFO] << myname << "(init): prop_prefix=" << prop_prefix << endl;
dlog.info() << myname << "(init): prop_prefix=" << prop_prefix << endl;
UniXML_iterator it(cnode);
......@@ -69,7 +69,7 @@ rs_pre_clean(false)
initMB(false);
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
printMap(rmap);
}
// -----------------------------------------------------------------------------
......@@ -130,7 +130,7 @@ ModbusClient* RTUExchange::initMB( bool reopen )
mbrtu->setSleepPause(sleepPause_usec);
mbrtu->setAfterSendPause(aftersend_pause);
dlog[Debug::INFO] << myname << "(init): dev=" << devname << " speed=" << ComPort::getSpeed( mbrtu->getSpeed() ) << endl;
dlog.info() << myname << "(init): dev=" << devname << " speed=" << ComPort::getSpeed( mbrtu->getSpeed() ) << endl;
}
catch( Exception& ex )
{
......@@ -138,7 +138,7 @@ ModbusClient* RTUExchange::initMB( bool reopen )
delete mbrtu;
mbrtu = 0;
dlog[Debug::WARN] << myname << "(init): " << ex << endl;
dlog.warn() << myname << "(init): " << ex << endl;
}
catch(...)
{
......@@ -146,7 +146,7 @@ ModbusClient* RTUExchange::initMB( bool reopen )
delete mbrtu;
mbrtu = 0;
dlog[Debug::INFO] << myname << "(init): catch...." << endl;
dlog.info() << myname << "(init): catch...." << endl;
}
mb = mbrtu;
......@@ -244,7 +244,7 @@ void RTUExchange::poll()
{
if( dlog.debugging(Debug::LEVEL3) )
{
dlog[Debug::CRIT] << myname << "(poll): FAILED ask addr=" << ModbusRTU::addr2str(d->mbaddr)
dlog.crit() << myname << "(poll): FAILED ask addr=" << ModbusRTU::addr2str(d->mbaddr)
<< " -> " << ex << endl;
}
d->resp_real = false;
......@@ -318,8 +318,8 @@ void RTUExchange::poll()
if( allNotRespond && ptReopen.checkTime() )
{
uniset_mutex_lock l(pollMutex, 300);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << ": REOPEN timeout..(" << ptReopen.getInterval() << ")" << endl;
if( dlog.is_warn() )
dlog.warn() << myname << ": REOPEN timeout..(" << ptReopen.getInterval() << ")" << endl;
mb = initMB(true);
ptReopen.reset();
......@@ -347,7 +347,7 @@ RTUExchange* RTUExchange::init_rtuexchange( int argc, const char* const* argv, U
return 0;
}
dlog[Debug::INFO] << "(rtuexchange): name = " << name << "(" << ID << ")" << endl;
dlog.info() << "(rtuexchange): name = " << name << "(" << ID << ")" << endl;
return new RTUExchange(ID,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
......@@ -359,7 +359,7 @@ bool RTUExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniX
RTUDeviceMap::iterator d = m.find(a);
if( d == m.end() )
{
dlog[Debug::WARN] << myname << "(initDeviceInfo): not found device for addr=" << ModbusRTU::addr2str(a) << endl;
dlog.warn() << myname << "(initDeviceInfo): not found device for addr=" << ModbusRTU::addr2str(a) << endl;
return false;
}
......@@ -370,7 +370,7 @@ bool RTUExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniX
if( d->second->speed == ComPort::ComSpeed0 )
{
d->second->speed = defSpeed;
dlog[Debug::CRIT] << myname << "(initDeviceInfo): Unknown speed=" << s <<
dlog.crit() << myname << "(initDeviceInfo): Unknown speed=" << s <<
" for addr=" << ModbusRTU::addr2str(a) << endl;
return false;
}
......
extensions/ModbusMaster/main.cc
View file @ dc1fabfe
......@@ -36,7 +36,7 @@ int main( int argc, const char** argv )
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
ObjectId shmID = DefaultObjectId;
......@@ -55,7 +55,7 @@ int main( int argc, const char** argv )
MBTCPMaster* mb = MBTCPMaster::init_mbmaster(argc,argv,shmID);
if( !mb )
{
dlog[Debug::CRIT] << "(mbmaster): init MBTCPMaster failed." << endl;
dlog.crit() << "(mbmaster): init MBTCPMaster failed." << endl;
return 1;
}
......@@ -65,21 +65,21 @@ int main( int argc, const char** argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- MBTCP Exchange START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- MBTCP Exchange START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- MBTCP Exchange START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- MBTCP Exchange START -------------------------\n\n";
act.run(false);
while( waitpid(-1, 0, 0) > 0 );
return 0;
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(mbtcpmaster): " << ex << std::endl;
dlog.crit() << "(mbtcpmaster): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(mbtcpmaster): catch ..." << std::endl;
dlog.crit() << "(mbtcpmaster): catch ..." << std::endl;
}
while( waitpid(-1, 0, 0) > 0 );
......
extensions/ModbusMaster/multi-main.cc
View file @ dc1fabfe
......@@ -36,7 +36,7 @@ int main( int argc, const char** argv )
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
ObjectId shmID = DefaultObjectId;
......@@ -55,7 +55,7 @@ int main( int argc, const char** argv )
MBTCPMultiMaster* mb = MBTCPMultiMaster::init_mbmaster(argc,argv,shmID);
if( !mb )
{
dlog[Debug::CRIT] << "(mbmaster): init MBTCPMaster failed." << endl;
dlog.crit() << "(mbmaster): init MBTCPMaster failed." << endl;
return 1;
}
......@@ -65,21 +65,23 @@ int main( int argc, const char** argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- MBTCPMulti Exchange START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- MBTCPMulti Exchange START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- MBTCPMulti Exchange START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- MBTCPMulti Exchange START -------------------------\n\n";
act.run(false);
while( waitpid(-1, 0, 0) > 0 );
return 0;
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(mbtcpmultimaster): " << ex << std::endl;
dlog.crit() << "(mbtcpmultimaster): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(mbtcpmultimaster): catch ..." << std::endl;
dlog.crit() << "(mbtcpmultimaster): catch ..." << std::endl;
}
while( waitpid(-1, 0, 0) > 0 );
......
extensions/ModbusMaster/rtuexchange.cc
View file @ dc1fabfe
......@@ -34,7 +34,7 @@ int main( int argc, char** argv )
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
ObjectId shmID = DefaultObjectId;
......@@ -53,7 +53,7 @@ int main( int argc, char** argv )
RTUExchange* rs = RTUExchange::init_rtuexchange(argc,argv,shmID,0,"rs");
if( !rs )
{
dlog[Debug::CRIT] << "(rtuexchange): init не прошёл..." << endl;
dlog.crit() << "(rtuexchange): init не прошёл..." << endl;
return 1;
}
......@@ -63,10 +63,10 @@ int main( int argc, char** argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- RTU Exchange START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- RTU Exchange START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- RTU Exchange START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- RTU Exchange START -------------------------\n\n";
act.run(false);
......@@ -75,11 +75,11 @@ int main( int argc, char** argv )
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(rtuexchange): " << ex << std::endl;
dlog.crit() << "(rtuexchange): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(rtuexchange): catch ..." << std::endl;
dlog.crit() << "(rtuexchange): catch ..." << std::endl;
}
while( waitpid(-1, 0, 0) > 0 );
......
extensions/ModbusSlave/MBSlave.cc
View file @ dc1fabfe
......@@ -46,7 +46,7 @@ prefix(prefix)
// определяем фильтр
s_field = conf->getArgParam("--" + prefix + "-filter-field");
s_fvalue = conf->getArgParam("--" + prefix + "-filter-value");
dlog[Debug::INFO] << myname << "(init): read s_field='" << s_field
dlog.info() << myname << "(init): read s_field='" << s_field
<< "' s_fvalue='" << s_fvalue << "'" << endl;
force = conf->getArgInt("--" + prefix + "-force",it.getProp("force"));
......@@ -61,7 +61,7 @@ prefix(prefix)
addr = ModbusRTU::str2mbAddr(saddr);
mbregFromID = conf->getArgInt("--" + prefix + "-reg-from-id",it.getProp("reg_from_id"));
dlog[Debug::INFO] << myname << "(init): mbregFromID=" << mbregFromID << endl;
dlog.info() << myname << "(init): mbregFromID=" << mbregFromID << endl;
respond_id = conf->getSensorID(conf->getArgParam("--" + prefix + "-respond-id",it.getProp("respond_id")));
respond_invert = conf->getArgInt("--" + prefix + "-respond-invert",it.getProp("respond_invert"));
......@@ -92,7 +92,7 @@ prefix(prefix)
mbslot = rs;
thr = new ThreadCreator<MBSlave>(this,&MBSlave::execute_rtu);
dlog[Debug::INFO] << myname << "(init): type=RTU myaddr=" << ModbusRTU::addr2str(addr)
dlog.info() << myname << "(init): type=RTU myaddr=" << ModbusRTU::addr2str(addr)
<< " dev=" << dev << " speed=" << speed << endl;
}
else if( stype == "TCP" )
......@@ -103,14 +103,16 @@ prefix(prefix)
int port = conf->getArgPInt("--" + prefix + "-inet-port",it.getProp("iport"), 502);
dlog[Debug::INFO] << myname << "(init): type=TCP myaddr=" << ModbusRTU::addr2str(addr)
if( dlog.is_info() )
dlog.info() << myname << "(init): type=TCP myaddr=" << ModbusRTU::addr2str(addr)
<< " inet=" << iaddr << " port=" << port << endl;
ost::InetAddress ia(iaddr.c_str());
mbslot = new ModbusTCPServerSlot(ia,port);
thr = new ThreadCreator<MBSlave>(this,&MBSlave::execute_tcp);
dlog[Debug::INFO] << myname << "(init): init TCP connection ok. " << " inet=" << iaddr << " port=" << port << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): init TCP connection ok. " << " inet=" << iaddr << " port=" << port << endl;
}
else
throw UniSetTypes::SystemError(myname+"(MBSlave): Unknown slave type. Use: --mbs-type [RTU|TCP]");
......@@ -140,7 +142,8 @@ prefix(prefix)
if( shm->isLocalwork() )
{
readConfiguration();
dlog[Debug::INFO] << myname << "(init): iomap size = " << iomap.size() << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): iomap size = " << iomap.size() << endl;
}
else
{
......@@ -158,7 +161,7 @@ prefix(prefix)
{
ostringstream err;
err << myname << ": не найден идентификатор для датчика 'HeartBeat' " << heart;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
......@@ -178,16 +181,17 @@ prefix(prefix)
{
ostringstream err;
err << myname << ": test_id unknown. 'TestMode_S' not found...";
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
askcount_id = conf->getSensorID(conf->getArgParam("--" + prefix + "-askcount-id",it.getProp("askcount_id")));
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << ": init askcount_id=" << askcount_id << endl;
dlog[Debug::INFO] << myname << ": init test_id=" << test_id << endl;
dlog.info() << myname << ": init askcount_id=" << askcount_id << endl;
dlog.info() << myname << ": init test_id=" << test_id << endl;
}
wait_msec = getHeartBeatTime() - 100;
......@@ -199,8 +203,8 @@ prefix(prefix)
timeout_t msec = conf->getArgPInt("--" + prefix + "-timeout",it.getProp("timeout"), 3000);
ptTimeout.setTiming(msec);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): rs-timeout=" << msec << " msec" << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): rs-timeout=" << msec << " msec" << endl;
// build file list...
xmlNode* fnode = 0;
......@@ -218,15 +222,15 @@ prefix(prefix)
std::string nm = fit.getProp("name");
if( nm.empty() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(build file list): ignore empty name... " << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(build file list): ignore empty name... " << endl;
continue;
}
int id = fit.getIntProp("id");
if( id == 0 )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(build file list): FAILED ID for " << nm << "... ignore..." << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(build file list): FAILED ID for " << nm << "... ignore..." << endl;
continue;
}
......@@ -241,8 +245,8 @@ prefix(prefix)
nm = dir + nm;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): add to filelist: "
if( dlog.is_info() )
dlog.info() << myname << "(init): add to filelist: "
<< "id=" << id
<< " file=" << nm
<< endl;
......@@ -250,11 +254,11 @@ prefix(prefix)
flist[id] = nm;
}
}
else if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): <filelist> empty..." << endl;
else if( dlog.is_info() )
dlog.info() << myname << "(init): <filelist> empty..." << endl;
}
else if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): <filelist> not found..." << endl;
else if( dlog.is_info() )
dlog.info() << myname << "(init): <filelist> not found..." << endl;
// Формирование "карты" ответов на запрос 0x2B(43)/0x0E(14)
......@@ -286,8 +290,8 @@ prefix(prefix)
{
if( dit.getProp("id").empty() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(init): read <MEI>. Unknown <device id=''>. Ignore.." << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(init): read <MEI>. Unknown <device id=''>. Ignore.." << endl;
continue;
}
......@@ -296,16 +300,16 @@ prefix(prefix)
UniXML_iterator oit(dit);
if( oit.goChildren() )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): MEI: read dev='" << devID << "'" << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): MEI: read dev='" << devID << "'" << endl;
MEIObjIDMap meiomap;
// Object ID list..
for( ;oit.getCurrent(); oit.goNext() )
{
if( dit.getProp("id").empty() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname
if( dlog.is_warn() )
dlog.warn() << myname
<< "(init): read <MEI>. Unknown <object id='' (for device id='"
<< devID << "'). Ignore.."
<< endl;
......@@ -317,8 +321,8 @@ prefix(prefix)
UniXML_iterator sit(oit);
if( sit.goChildren() )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): MEI: read obj='" << objID << "'" << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): MEI: read obj='" << objID << "'" << endl;
MEIValMap meivmap;
// request (string) list..
......@@ -327,8 +331,8 @@ prefix(prefix)
int vid = objID;
if( sit.getProp("id").empty() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::INFO] << myname << "(init): MEI: dev='" << devID
if( dlog.is_warn() )
dlog.info() << myname << "(init): MEI: dev='" << devID
<< "' obj='" << objID << "'"
<< ". Unknown id='' for value='" << sit.getProp("value") << "'"
<< ". Set objID='" << objID << "'"
......@@ -351,11 +355,11 @@ prefix(prefix)
}
}
if( !meidev.empty() && dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): <MEI> init ok." << endl;
if( !meidev.empty() && dlog.is_info() )
dlog.info() << myname << "(init): <MEI> init ok." << endl;
}
else if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): <MEI> empty..." << endl;
else if( dlog.is_info() )
dlog.info() << myname << "(init): <MEI> empty..." << endl;
}
// -----------------------------------------------------------------------------
......@@ -379,7 +383,8 @@ void MBSlave::waitSMReady()
{
ostringstream err;
err << myname << "(waitSMReady): Не дождались готовности SharedMemory к работе в течение " << ready_timeout << " мсек";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -408,8 +413,8 @@ void MBSlave::execute_rtu()
prev = res;
}
if( res!=ModbusRTU::erNoError && res!=ModbusRTU::erTimeOut && dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(execute_rtu): " << ModbusRTU::mbErr2Str(res) << endl;
if( res!=ModbusRTU::erNoError && res!=ModbusRTU::erTimeOut && dlog.is_warn() )
dlog.warn() << myname << "(execute_rtu): " << ModbusRTU::mbErr2Str(res) << endl;
if( !activated )
continue;
......@@ -423,8 +428,8 @@ void MBSlave::execute_rtu()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
if( dlog.is_crit() )
dlog.crit() << myname
<< "(execute_rtu): (hb) " << ex << std::endl;
}
}
......@@ -441,9 +446,8 @@ void MBSlave::execute_rtu()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
<< "(execute_rtu): (respond) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(execute_rtu): (respond) " << ex << std::endl;
}
}
......@@ -455,9 +459,8 @@ void MBSlave::execute_rtu()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
<< "(execute_rtu): (askCount) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(execute_rtu): (askCount) " << ex << std::endl;
}
}
......@@ -492,8 +495,8 @@ void MBSlave::execute_tcp()
prev = res;
}
if( res!=ModbusRTU::erNoError && res!=ModbusRTU::erTimeOut && dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(execute_tcp): " << ModbusRTU::mbErr2Str(res) << endl;
if( res!=ModbusRTU::erNoError && res!=ModbusRTU::erTimeOut && dlog.is_warn() )
dlog.warn() << myname << "(execute_tcp): " << ModbusRTU::mbErr2Str(res) << endl;
if( !activated )
continue;
......@@ -507,9 +510,8 @@ void MBSlave::execute_tcp()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
<< "(execute_tcp): (hb) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(execute_tcp): (hb) " << ex << std::endl;
}
}
......@@ -524,8 +526,8 @@ void MBSlave::execute_tcp()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
if( dlog.is_crit() )
dlog.crit() << myname
<< "(execute_rtu): (respond) " << ex << std::endl;
}
}
......@@ -538,8 +540,8 @@ void MBSlave::execute_tcp()
}
catch(Exception& ex)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname
if( dlog.is_crit() )
dlog.crit() << myname
<< "(execute_rtu): (askCount) " << ex << std::endl;
}
}
......@@ -578,20 +580,20 @@ void MBSlave::processingMessage(UniSetTypes::VoidMessage *msg)
}
catch( SystemError& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(SystemError): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(SystemError): " << ex << std::endl;
// throw SystemError(ex);
raise(SIGTERM);
}
catch( Exception& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(processingMessage): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): " << ex << std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(processingMessage): catch ...\n";
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): catch ...\n";
}
}
// -----------------------------------------------------------------------------
......@@ -603,8 +605,8 @@ void MBSlave::sysCommand(UniSetTypes::SystemMessage *sm)
{
if( iomap.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(sysCommand): iomap EMPTY! terminated..." << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(sysCommand): iomap EMPTY! terminated..." << endl;
raise(SIGTERM);
return;
}
......@@ -623,8 +625,8 @@ void MBSlave::sysCommand(UniSetTypes::SystemMessage *sm)
break;
}
if( !activated && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
if( !activated && dlog.is_crit() )
dlog.crit() << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
else
{
UniSetTypes::uniset_rwmutex_rlock l(mutex_start);
......@@ -655,12 +657,12 @@ void MBSlave::sysCommand(UniSetTypes::SystemMessage *sm)
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb << myname << "(sysCommand): logRotate" << std::endl;
string fname = unideb.getLogFile();
ulog << myname << "(sysCommand): logRotate" << std::endl;
string fname(ulog.getLogFile());
if( !fname.empty() )
{
unideb.logFile(fname);
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
ulog.logFile(fname);
ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
}
dlog << myname << "(sysCommand): logRotate" << std::endl;
......@@ -687,7 +689,7 @@ void MBSlave::askSensors( UniversalIO::UIOCommand cmd )
<< "(askSensors): Не дождались готовности(work) SharedMemory к работе в течение "
<< activateTimeout << " мсек";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
throw SystemError(err.str());
}
......@@ -705,8 +707,8 @@ void MBSlave::askSensors( UniversalIO::UIOCommand cmd )
}
catch( UniSetTypes::Exception& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(askSensors): " << ex << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(askSensors): " << ex << std::endl;
}
catch(...){}
}
......@@ -748,12 +750,12 @@ void MBSlave::sensorInfo( UniSetTypes::SensorMessage* sm )
p->value = sm->value;
}
if( dlog.debugging(Debug::CRIT) )
if( dlog.is_crit() )
{
// вообще этого не может случиться
// потому-что корректность проверяется при загрузке
if( i != sz && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(sensorInfo): update failed for sid=" << sm->id
if( i != sz && dlog.is_crit() )
dlog.crit() << myname << "(sensorInfo): update failed for sid=" << sm->id
<< " (i=" << i << " sz=" << sz << ")" << endl;
}
return;
......@@ -805,8 +807,8 @@ void MBSlave::readConfiguration()
UniXML_iterator it(root);
if( !it.goChildren() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readConfiguration): раздел <sensors> не содержит секций ?!!\n";
if( dlog.is_crit() )
dlog.crit() << myname << "(readConfiguration): раздел <sensors> не содержит секций ?!!\n";
return;
}
......@@ -841,8 +843,8 @@ bool MBSlave::initItem( UniXML_iterator& it )
string r = it.getProp("mbreg");
if( r.empty() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Unknown 'mbreg' for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Unknown 'mbreg' for " << it.getProp("name") << endl;
return false;
}
......@@ -856,8 +858,8 @@ bool MBSlave::initItem( UniXML_iterator& it )
p.stype = UniSetTypes::getIOType(stype);
if( p.stype == UniversalIO::UnknownIOType )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Unknown 'iotype' or 'mb_iotype' for " << it.getProp("name") << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Unknown 'iotype' or 'mb_iotype' for " << it.getProp("name") << endl;
return false;
}
......@@ -874,8 +876,8 @@ bool MBSlave::initItem( UniXML_iterator& it )
p.vtype = VTypes::vtUnknown;
p.wnum = 0;
iomap[p.mbreg] = p;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(initItem): add " << p << endl;
if( dlog.is_info() )
dlog.info() << myname << "(initItem): add " << p << endl;
}
else
......@@ -883,8 +885,8 @@ bool MBSlave::initItem( UniXML_iterator& it )
VTypes::VType v(VTypes::str2type(vt));
if( v == VTypes::vtUnknown )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(initItem): Unknown rtuVType=" << vt << " for "
if( dlog.is_crit() )
dlog.crit() << myname << "(initItem): Unknown rtuVType=" << vt << " for "
<< it.getProp("name")
<< endl;
......@@ -897,8 +899,8 @@ bool MBSlave::initItem( UniXML_iterator& it )
p.mbreg += i;
p.wnum+= i;
iomap[p.mbreg] = p;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(initItem): add " << p << endl;
if( dlog.is_info() )
dlog.info() << myname << "(initItem): add " << p << endl;
}
}
......@@ -963,8 +965,8 @@ MBSlave* MBSlave::init_mbslave( int argc, const char* const* argv, UniSetTypes::
return 0;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(mbslave): name = " << name << "(" << ID << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(mbslave): name = " << name << "(" << ID << ")" << endl;
return new MBSlave(ID,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
......@@ -989,8 +991,8 @@ std::ostream& operator<<( std::ostream& os, MBSlave::IOProperty& p )
ModbusRTU::mbErrCode MBSlave::readOutputRegisters( ModbusRTU::ReadOutputMessage& query,
ModbusRTU::ReadOutputRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(readOutputRegisters): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(readOutputRegisters): " << query << endl;
if( query.count <= 1 )
{
......@@ -1018,8 +1020,8 @@ ModbusRTU::mbErrCode MBSlave::readOutputRegisters( ModbusRTU::ReadOutputMessage&
ModbusRTU::mbErrCode MBSlave::writeOutputRegisters( ModbusRTU::WriteOutputMessage& query,
ModbusRTU::WriteOutputRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(writeOutputRegisters): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(writeOutputRegisters): " << query << endl;
// Формирование ответа:
ModbusRTU::mbErrCode ret = much_real_write(query.start,query.data,query.quant);
......@@ -1031,8 +1033,8 @@ ModbusRTU::mbErrCode MBSlave::writeOutputRegisters( ModbusRTU::WriteOutputMessag
ModbusRTU::mbErrCode MBSlave::writeOutputSingleRegister( ModbusRTU::WriteSingleOutputMessage& query,
ModbusRTU::WriteSingleOutputRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(writeOutputSingleRegisters): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(writeOutputSingleRegisters): " << query << endl;
ModbusRTU::mbErrCode ret = real_write(query.start,query.data);
if( ret == ModbusRTU::erNoError )
......@@ -1043,9 +1045,9 @@ ModbusRTU::mbErrCode MBSlave::writeOutputSingleRegister( ModbusRTU::WriteSingleO
// -------------------------------------------------------------------------
ModbusRTU::mbErrCode MBSlave::much_real_write( ModbusRTU::ModbusData reg, ModbusRTU::ModbusData* dat,
int count )
{ if( dlog.debugging(Debug::INFO) )
{ if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(much_real_write): read mbID="
dlog.info() << myname << "(much_real_write): read mbID="
<< ModbusRTU::dat2str(reg) << " count=" << count << endl;
}
......@@ -1078,9 +1080,9 @@ ModbusRTU::mbErrCode MBSlave::much_real_write( ModbusRTU::ModbusData reg, Modbus
// -------------------------------------------------------------------------
ModbusRTU::mbErrCode MBSlave::real_write( ModbusRTU::ModbusData reg, ModbusRTU::ModbusData mbval )
{
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(write): save mbID="
dlog.info() << myname << "(write): save mbID="
<< ModbusRTU::dat2str(reg)
<< " data=" << ModbusRTU::dat2str(mbval)
<< "(" << (int)mbval << ")" << endl;
......@@ -1178,31 +1180,31 @@ ModbusRTU::mbErrCode MBSlave::real_write_it( IOMap::iterator& it, ModbusRTU::Mod
}
catch( UniSetTypes::NameNotFound& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(write): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(write): " << ex << endl;
return ModbusRTU::erBadDataAddress;
}
catch( UniSetTypes::OutOfRange& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(write): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(write): " << ex << endl;
return ModbusRTU::erBadDataValue;
}
catch( Exception& ex )
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(write): " << ex << endl;
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(write): " << ex << endl;
}
catch( CORBA::SystemException& ex )
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(write): СORBA::SystemException: "
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(write): СORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(write) catch ..." << endl;
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(write) catch ..." << endl;
}
pingOK = false;
......@@ -1212,9 +1214,9 @@ ModbusRTU::mbErrCode MBSlave::real_write_it( IOMap::iterator& it, ModbusRTU::Mod
ModbusRTU::mbErrCode MBSlave::much_real_read( ModbusRTU::ModbusData reg, ModbusRTU::ModbusData* dat,
int count )
{
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(much_real_read): read mbID="
dlog.info() << myname << "(much_real_read): read mbID="
<< ModbusRTU::dat2str(reg) << " count=" << count << endl;
}
......@@ -1261,9 +1263,9 @@ ModbusRTU::mbErrCode MBSlave::much_real_read( ModbusRTU::ModbusData reg, ModbusR
// -------------------------------------------------------------------------
ModbusRTU::mbErrCode MBSlave::real_read( ModbusRTU::ModbusData reg, ModbusRTU::ModbusData& val )
{
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(real_read): read mbID="
dlog.info() << myname << "(real_read): read mbID="
<< ModbusRTU::dat2str(reg) << endl;
}
......@@ -1278,9 +1280,9 @@ ModbusRTU::mbErrCode MBSlave::real_read_it( IOMap::iterator& it, ModbusRTU::Modb
try
{
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(real_read_it): read mbID="
dlog.info() << myname << "(real_read_it): read mbID="
<< ModbusRTU::dat2str(it->first) << endl;
}
......@@ -1353,31 +1355,31 @@ ModbusRTU::mbErrCode MBSlave::real_read_it( IOMap::iterator& it, ModbusRTU::Modb
}
catch( UniSetTypes::NameNotFound& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(real_read_it): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(real_read_it): " << ex << endl;
return ModbusRTU::erBadDataAddress;
}
catch( UniSetTypes::OutOfRange& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(real_read_it): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(real_read_it): " << ex << endl;
return ModbusRTU::erBadDataValue;
}
catch( Exception& ex )
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(real_read_it): " << ex << endl;
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(real_read_it): " << ex << endl;
}
catch( CORBA::SystemException& ex )
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(real_read_it): CORBA::SystemException: "
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(real_read_it): CORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(real_read_it) catch ..." << endl;
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(real_read_it) catch ..." << endl;
}
pingOK = false;
......@@ -1387,8 +1389,8 @@ ModbusRTU::mbErrCode MBSlave::real_read_it( IOMap::iterator& it, ModbusRTU::Modb
mbErrCode MBSlave::readInputRegisters( ReadInputMessage& query, ReadInputRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(readInputRegisters): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(readInputRegisters): " << query << endl;
if( query.count <= 1 )
{
......@@ -1429,8 +1431,8 @@ ModbusRTU::mbErrCode MBSlave::remoteService( ModbusRTU::RemoteServiceMessage& qu
ModbusRTU::mbErrCode MBSlave::fileTransfer( ModbusRTU::FileTransferMessage& query,
ModbusRTU::FileTransferRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(fileTransfer): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(fileTransfer): " << query << endl;
FileList::iterator it = flist.find(query.numfile);
if( it == flist.end() )
......@@ -1450,8 +1452,8 @@ ModbusRTU::mbErrCode MBSlave::readCoilStatus( ReadCoilMessage& query,
ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
ReadInputStatusRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(readInputStatus): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(readInputStatus): " << query << endl;
try
{
......@@ -1486,25 +1488,26 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
}
catch( UniSetTypes::NameNotFound& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(readInputStatus): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(readInputStatus): " << ex << endl;
return ModbusRTU::erBadDataAddress;
}
catch( Exception& ex )
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readInputStatus): " << ex << endl;
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(readInputStatus): " << ex << endl;
}
catch( CORBA::SystemException& ex )
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readInputStatus): СORBA::SystemException: "
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(readInputStatus): СORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
if( pingOK && dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << myname << "(readInputStatus): catch ..." << endl;
if( pingOK && dlog.is_crit() )
dlog.crit() << myname << "(readInputStatus): catch ..." << endl;
}
pingOK = false;
......@@ -1514,8 +1517,8 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
ModbusRTU::mbErrCode MBSlave::forceMultipleCoils( ModbusRTU::ForceCoilsMessage& query,
ModbusRTU::ForceCoilsRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(forceMultipleCoils): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(forceMultipleCoils): " << query << endl;
ModbusRTU::mbErrCode ret = ModbusRTU::erNoError;
int nbit = 0;
......@@ -1540,8 +1543,8 @@ ModbusRTU::mbErrCode MBSlave::forceMultipleCoils( ModbusRTU::ForceCoilsMessage&
ModbusRTU::mbErrCode MBSlave::forceSingleCoil( ModbusRTU::ForceSingleCoilMessage& query,
ModbusRTU::ForceSingleCoilRetMessage& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(forceSingleCoil): " << query << endl;
if( dlog.is_info() )
dlog.info() << myname << "(forceSingleCoil): " << query << endl;
ModbusRTU::mbErrCode ret = real_write(query.start, (query.cmd() ? 1 : 0) );
if( ret == ModbusRTU::erNoError )
......@@ -1596,8 +1599,8 @@ ModbusRTU::mbErrCode MBSlave::diagnostics( ModbusRTU::DiagnosticMessage& query,
ModbusRTU::mbErrCode MBSlave::read4314( ModbusRTU::MEIMessageRDI& query,
ModbusRTU::MEIMessageRetRDI& reply )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(read4314): " << query << endl;
if( dlog.is_info() )
dlog.info() << "(read4314): " << query << endl;
// if( query.devID <= rdevMinNum || query.devID >= rdevMaxNum )
// return erOperationFailed;
......
extensions/ModbusSlave/mbslave.cc
View file @ dc1fabfe
......@@ -39,7 +39,7 @@ int main(int argc, const char **argv)
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
conf->initDebug(dlog,"dlog");
......@@ -60,7 +60,7 @@ int main(int argc, const char **argv)
MBSlave* s = MBSlave::init_mbslave(argc,argv,shmID);
if( !s )
{
dlog[Debug::CRIT] << "(mbslave): init не прошёл..." << endl;
dlog.crit() << "(mbslave): init не прошёл..." << endl;
return 1;
}
......@@ -69,10 +69,10 @@ int main(int argc, const char **argv)
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- MBSlave START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- MBSlave START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- MBSlave START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- MBSlave START -------------------------\n\n";
act.run(false);
while( waitpid(-1, 0, 0) > 0 );
......@@ -80,19 +80,19 @@ int main(int argc, const char **argv)
}
catch( SystemError& err )
{
dlog[Debug::CRIT] << "(mbslave): " << err << endl;
dlog.crit() << "(mbslave): " << err << endl;
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(mbslave): " << ex << endl;
dlog.crit() << "(mbslave): " << ex << endl;
}
catch( std::exception& e )
{
dlog[Debug::CRIT] << "(mbslave): " << e.what() << endl;
dlog.crit() << "(mbslave): " << e.what() << endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(mbslave): catch(...)" << endl;
dlog.crit() << "(mbslave): catch(...)" << endl;
}
while( waitpid(-1, 0, 0) > 0 );
......
extensions/RRDServer/RRDServer.cc
View file @ dc1fabfe
......@@ -25,7 +25,8 @@ prefix(prefix)
{
ostringstream err;
err << myname << "(init): empty rrd list...";
RRDServer::dlog[Debug::CRIT] << err.str() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str() << endl;
throw NameNotFound(err.str());
}
......@@ -57,8 +58,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
int lastup = it.getPIntProp("lastup",0);
bool overwrite = it.getPIntProp("overwrite",0);
if( RRDServer::dlog.debugging(Debug::INFO) )
RRDServer::dlog[Debug::INFO] << myname << "(init): add rrd: file='" << fname
if( RRDServer::dlog.is_info() )
RRDServer::dlog.info() << myname << "(init): add rrd: file='" << fname
<< " " << ff << "='" << fv
<< "' create='" << cf << "'"
<< " step=" << rrdstep
......@@ -71,7 +72,7 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): rrd='" << fname << "' Unknown RRA list";
RRDServer::dlog[Debug::CRIT] << err.str();
RRDServer::dlog.crit() << err.str();
throw SystemError(err.str());
}
......@@ -82,7 +83,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): rrd='" << fname << "' Unkown RRA item.. <item rra='...'";
RRDServer::dlog[Debug::CRIT] << err.str();
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str();
throw SystemError(err.str());
}
......@@ -93,7 +95,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): Not found RRA items...";
RRDServer::dlog[Debug::CRIT] << err.str() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
......@@ -105,7 +108,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): Not found section <sensors>";
RRDServer::dlog[Debug::CRIT] << err.str();
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str();
throw SystemError(err.str());
}
......@@ -114,7 +118,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): section <sensors> empty?!";
RRDServer::dlog[Debug::CRIT] << err.str();
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str();
throw SystemError(err.str());
}
......@@ -133,7 +138,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): Unknown create parameters ('" << cf << "')";
RRDServer::dlog[Debug::CRIT] << err.str();
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str();
throw SystemError(err.str());
}
......@@ -147,7 +153,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): Unknown SensorID for '" << dsname << "'";
RRDServer::dlog[Debug::CRIT] << err.str();
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str();
throw SystemError(err.str());
}
......@@ -159,7 +166,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): Not found RRD items...";
RRDServer::dlog[Debug::CRIT] << err.str() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
......@@ -179,8 +187,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
// Собственно создаём RRD
if( !overwrite && file_exist(fname) )
{
if( RRDServer::dlog.debugging(Debug::INFO) )
RRDServer::dlog[Debug::INFO] << myname << "(init): ignore create file='" << fname
if( RRDServer::dlog.is_info() )
RRDServer::dlog.info() << myname << "(init): ignore create file='" << fname
<< "'. File exist... overwrite=0." << endl;
}
else
......@@ -190,7 +198,8 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
{
ostringstream err;
err << myname << "(init): Can`t create RRD ('" << fname << "'): err: " << string(rrd_get_error());
RRDServer::dlog[Debug::CRIT] << err.str() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -206,11 +215,11 @@ void RRDServer::initRRD( xmlNode* cnode, int tmID )
}
/* catch( Exception& ex )
{
RRDServer::dlog[Debug::CRIT] << myname << "(init) " << ex << std::endl;
RRDServer::dlog.crit() << myname << "(init) " << ex << std::endl;
}
catch( ... )
{
RRDServer::dlog[Debug::CRIT] << myname << "(init): catch ..." << std::endl;
RRDServer::dlog.crit() << myname << "(init): catch ..." << std::endl;
}
*/
}
......@@ -231,14 +240,14 @@ RRDServer* RRDServer::init_rrdstorage( int argc, const char* const* argv,
string name = conf->getArgParam("--" + prefix + "-name","RRDServer");
if( name.empty() )
{
UniSetExtensions::dlog[Debug::CRIT] << "(RRDServer): Unknown name. Usage: --" << prefix << "-name" << endl;
UniSetExtensions::dlog.crit() << "(RRDServer): Unknown name. Usage: --" << prefix << "-name" << endl;
return 0;
}
ObjectId ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId )
{
UniSetExtensions::dlog[Debug::CRIT] << "(RRDServer): Not found ID for '" << name
UniSetExtensions::dlog.crit() << "(RRDServer): Not found ID for '" << name
<< " in '" << conf->getObjectsSection() << "' section" << endl;
return 0;
}
......@@ -247,11 +256,12 @@ RRDServer* RRDServer::init_rrdstorage( int argc, const char* const* argv,
xmlNode* cnode = conf->getNode(confname);
if( !cnode )
{
UniSetExtensions::dlog[Debug::CRIT] << "(RRDServer): " << name << "(init): Not found <" + confname + ">" << endl;
UniSetExtensions::dlog.crit() << "(RRDServer): " << name << "(init): Not found <" + confname + ">" << endl;
return 0;
}
UniSetExtensions::dlog[Debug::INFO] << "(RRDServer): name = " << name << "(" << ID << ")" << endl;
if( UniSetExtensions::dlog.is_info() )
UniSetExtensions::dlog.info() << "(RRDServer): name = " << name << "(" << ID << ")" << endl;
return new RRDServer(ID,cnode,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
......@@ -269,7 +279,8 @@ void RRDServer::askSensors( UniversalIO::UIOCommand cmd )
}
catch( std::exception& ex )
{
RRDServer::dlog[Debug::CRIT] << myname << "(askSensors): " << ex.what() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << myname << "(askSensors): " << ex.what() << endl;
}
}
}
......@@ -288,7 +299,8 @@ void RRDServer::sysCommand( UniSetTypes::SystemMessage* sm )
}
catch( std::exception& ex )
{
RRDServer::dlog[Debug::CRIT] << myname << "(askTimer): " << ex.what() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << myname << "(askTimer): " << ex.what() << endl;
}
}
}
......@@ -318,8 +330,8 @@ void RRDServer::timerInfo( UniSetTypes::TimerMessage* tm )
for( DSMap::iterator s=it->dsmap.begin(); s!=it->dsmap.end(); ++s )
v << ":" << s->second.value;
if( RRDServer::dlog.debugging(Debug::INFO) )
RRDServer::dlog[Debug::INFO] << myname << "(update): '" << it->filename << "' " << v.str() << endl;
if( RRDServer::dlog.is_info() )
RRDServer::dlog.info() << myname << "(update): '" << it->filename << "' " << v.str() << endl;
rrd_clear_error();
const char* argv = v.str().c_str();
......@@ -327,7 +339,8 @@ void RRDServer::timerInfo( UniSetTypes::TimerMessage* tm )
{
ostringstream err;
err << myname << "(update): Can`t update RRD ('" << it->filename << "'): err: " << string(rrd_get_error());
RRDServer::dlog[Debug::CRIT] << err.str() << endl;
if( RRDServer::dlog.is_crit() )
RRDServer::dlog.crit() << err.str() << endl;
}
break;
......
extensions/RRDServer/main.cc
View file @ dc1fabfe
......@@ -35,7 +35,7 @@ int main( int argc, const char** argv )
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
ObjectId shmID = DefaultObjectId;
......@@ -54,7 +54,7 @@ int main( int argc, const char** argv )
RRDServer* db = RRDServer::init_rrdstorage(argc,argv,shmID);
if( !db )
{
dlog[Debug::CRIT] << "(rrdstorage): init не прошёл..." << endl;
dlog.crit() << "(rrdstorage): init не прошёл..." << endl;
return 1;
}
......@@ -64,20 +64,20 @@ int main( int argc, const char** argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- RRDServer START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- RRDServer START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- RRDServer START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- RRDServer START -------------------------\n\n";
act.run(false);
return 0;
}
catch( UniSetTypes::Exception& ex )
{
dlog[Debug::CRIT] << "(rrdstorage): " << ex << std::endl;
dlog.crit() << "(rrdstorage): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(rrdstorage): catch ..." << std::endl;
dlog.crit() << "(rrdstorage): catch ..." << std::endl;
}
return 1;
......
extensions/SMDBServer/SMDBServer.cc
View file @ dc1fabfe
......@@ -42,7 +42,7 @@ prefix(prefix)
{
ostringstream err;
err << myname << ": ID not found ('HeartBeat') for " << heart;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
......@@ -62,12 +62,12 @@ prefix(prefix)
{
ostringstream err;
err << myname << "(init): test_id unknown. 'TestMode_S' not found...";
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
dlog[Debug::INFO] << myname << "(init): test_id=" << test_id << endl;
dlog.info() << myname << "(init): test_id=" << test_id << endl;
}
......@@ -90,7 +90,7 @@ void SMDBServer::waitSMReady()
{
ostringstream err;
err << myname << "(waitSMReady): Wait SharedMemory failed. [ " << ready_timeout << " msec ]";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -108,7 +108,7 @@ void SMDBServer::step()
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(step): (hb) " << ex << std::endl;
dlog.crit() << myname << "(step): (hb) " << ex << std::endl;
}
}
}
......@@ -132,14 +132,14 @@ void SMDBServer::initDB( DBInterface *db )
xmlNode* snode = conf->getXMLSensorsSection();
if(!snode)
{
dlog[Debug::CRIT] << myname << ": section <sensors> not found.." << endl;
dlog.crit() << myname << ": section <sensors> not found.." << endl;
return;
}
UniXML_iterator it(snode);
if( !it.goChildren() )
{
dlog[Debug::CRIT] << myname << ": section <sensors> empty?!.." << endl;
dlog.crit() << myname << ": section <sensors> empty?!.." << endl;
return;
}
......@@ -156,18 +156,18 @@ void SMDBServer::initDB( DBInterface *db )
if( !writeToBase("INSERT IGNORE INTO ObjectsMap(name,rep_name,id,msg)"+data.str()) )
{
dlog[Debug::CRIT] << myname << "(insert) ObjectsMap msg error: "<< db->error() << std::endl;
dlog.crit() << myname << "(insert) ObjectsMap msg error: "<< db->error() << std::endl;
db->freeResult();
}
}
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(filling ObjectsMap): " << ex << std::endl;
dlog.crit() << myname << "(filling ObjectsMap): " << ex << std::endl;
}
catch( ... )
{
dlog[Debug::CRIT] << myname << "(filling ObjectsMap): catch ..." << std::endl;
dlog.crit() << myname << "(filling ObjectsMap): catch ..." << std::endl;
}
}
//--------------------------------------------------------------------------------
......@@ -198,7 +198,7 @@ SMDBServer* SMDBServer::init_smdbserver( int argc, const char* const* argv,
return 0;
}
dlog[Debug::INFO] << "(SMDBServer): name = " << name << "(" << ID << ")" << endl;
dlog.info() << "(SMDBServer): name = " << name << "(" << ID << ")" << endl;
return new SMDBServer(ID,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
extensions/SMDBServer/main.cc
View file @ dc1fabfe
......@@ -35,7 +35,7 @@ int main( int argc, const char** argv )
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
dlog.logFile( logname.str() );
ObjectId shmID = DefaultObjectId;
......@@ -54,7 +54,7 @@ int main( int argc, const char** argv )
SMDBServer* db = SMDBServer::init_smdbserver(argc,argv,shmID);
if( !db )
{
dlog[Debug::CRIT] << "(smdbserver): init не прошёл..." << endl;
dlog.crit() << "(smdbserver): init не прошёл..." << endl;
return 1;
}
......@@ -64,8 +64,8 @@ int main( int argc, const char** argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- SMDBServer START -------------------------\n\n";
ulog.ebug::ANY) << "\n\n\n";
ulog.ebug::ANY] << "(main): -------------- SMDBServer START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- SMDBServer START -------------------------\n\n";
act.run(false);
......@@ -73,11 +73,11 @@ int main( int argc, const char** argv )
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(smdbserver): " << ex << std::endl;
dlog.crit() << "(smdbserver): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(smdbserver): catch ..." << std::endl;
dlog.crit() << "(smdbserver): catch ..." << std::endl;
}
return 1;
......
extensions/SharedMemory/SharedMemory.cc
View file @ dc1fabfe
......@@ -73,9 +73,9 @@ SharedMemory::SharedMemory( ObjectId id, string datafile, std::string confname )
heartbeat_node = conf->getArgParam("--heartbeat-node");
if( heartbeat_node.empty() )
dlog[Debug::WARN] << myname << "(init): --heartbeat-node NULL ===> heartbeat NOT USED..." << endl;
dlog.warn() << myname << "(init): --heartbeat-node NULL ===> heartbeat NOT USED..." << endl;
else
dlog[Debug::INFO] << myname << "(init): heartbeat-node: " << heartbeat_node << endl;
dlog.info() << myname << "(init): heartbeat-node: " << heartbeat_node << endl;
heartbeatCheckTime = conf->getArgInt("--heartbeat-check-time","1000");
......@@ -90,7 +90,7 @@ SharedMemory::SharedMemory( ObjectId id, string datafile, std::string confname )
if( !wdt_dev.empty() )
wdt = new WDTInterface(wdt_dev);
else
dlog[Debug::WARN] << myname << "(init): watchdog timer NOT USED (--wdt-device NULL)" << endl;
dlog.warn() << myname << "(init): watchdog timer NOT USED (--wdt-device NULL)" << endl;
dblogging = conf->getArgInt("--db-logging");
......@@ -112,7 +112,7 @@ SharedMemory::SharedMemory( ObjectId id, string datafile, std::string confname )
{
ostringstream err;
err << myname << ": ID not found ('pulsar') for " << p;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
siPulsar.node = conf->getLocalNode();
......@@ -163,32 +163,32 @@ void SharedMemory::processingMessage( UniSetTypes::VoidMessage *msg )
default:
//dlog[Debug::WARN] << myname << ": неизвестное сообщение " << msg->type << endl;
//dlog.warn() << myname << ": неизвестное сообщение " << msg->type << endl;
break;
}
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(processingMessage): " << ex << endl;
dlog.crit() << myname << "(processingMessage): " << ex << endl;
}
catch(CORBA::SystemException& ex)
{
dlog[Debug::WARN] << myname << "(processingMessage): CORBA::SystemException: " << ex.NP_minorString() << endl;
dlog.warn() << myname << "(processingMessage): CORBA::SystemException: " << ex.NP_minorString() << endl;
}
catch(CORBA::Exception& ex)
{
dlog[Debug::WARN] << myname << "(processingMessage): CORBA::Exception: " << ex._name() << endl;
dlog.warn() << myname << "(processingMessage): CORBA::Exception: " << ex._name() << endl;
}
catch( omniORB::fatalException& fe )
{
dlog[Debug::CRIT] << myname << "(processingMessage): Caught omniORB::fatalException:" << endl;
dlog[Debug::CRIT] << myname << "(processingMessage): file: " << fe.file()
dlog.crit() << myname << "(processingMessage): Caught omniORB::fatalException:" << endl;
dlog.crit() << myname << "(processingMessage): file: " << fe.file()
<< " line: " << fe.line()
<< " mesg: " << fe.errmsg() << endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(processingMessage): catch..." << endl;
dlog.crit() << myname << "(processingMessage): catch..." << endl;
}
}
......@@ -241,7 +241,7 @@ void SharedMemory::sysCommand( SystemMessage *sm )
}
if( !isActivated() )
dlog[Debug::CRIT] << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
dlog.crit() << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
// подождать пока пройдёт инициализация
// см. activateObject()
......@@ -287,7 +287,7 @@ void SharedMemory::askSensors( UniversalIO::UIOCommand cmd )
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(askSensors): " << ex << endl;
dlog.crit() << myname << "(askSensors): " << ex << endl;
}
}
*/
......@@ -395,11 +395,11 @@ void SharedMemory::checkHeartBeat()
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(checkHeartBeat): " << ex << endl;
dlog.crit() << myname << "(checkHeartBeat): " << ex << endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(checkHeartBeat): ..." << endl;
dlog.crit() << myname << "(checkHeartBeat): ..." << endl;
}
}
......@@ -439,7 +439,7 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec )
<< ") указан неверно ("
<< it.getProp("iotype") << ") должен быть 'AI'";
dlog[Debug::CRIT] << msg.str() << endl;
dlog.crit() << msg.str() << endl;
kill(getpid(),SIGTERM);
// throw NameNotFound(msg.str());
};
......@@ -453,7 +453,7 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec )
{
ostringstream msg;
msg << "(SharedMemory::readItem): дискретный датчик (heartbeat_ds_name) связанный с " << it.getProp("name");
dlog[Debug::WARN] << msg.str() << endl;
dlog.warn() << msg.str() << endl;
}
}
else
......@@ -466,7 +466,7 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec )
// Если уж задали имя для датчика, то он должен существовать..
// поэтому завершаем процесс, если не нашли..
dlog[Debug::CRIT] << msg.str() << endl;
dlog.crit() << msg.str() << endl;
kill(getpid(),SIGTERM);
// throw NameNotFound(msg.str());
}
......@@ -481,7 +481,7 @@ bool SharedMemory::readItem( UniXML& xml, UniXML_iterator& it, xmlNode* sec )
msg << "(SharedMemory::readItem): НЕ УКАЗАН id для "
<< it.getProp("name") << " секция " << sec;
dlog[Debug::CRIT] << msg.str() << endl;
dlog.crit() << msg.str() << endl;
kill(getpid(),SIGTERM);
// throw NameNotFound(msg.str());
};
......@@ -499,7 +499,7 @@ SharedMemory* SharedMemory::init_smemory( int argc, const char* const* argv )
if( dfile[0]!='.' && dfile[0]!='/' )
dfile = conf->getConfDir() + dfile;
dlog[Debug::INFO] << "(smemory): datfile = " << dfile << endl;
dlog.info() << "(smemory): datfile = " << dfile << endl;
UniSetTypes::ObjectId ID = conf->getControllerID(conf->getArgParam("--smemory-id","SharedMemory"));
if( ID == UniSetTypes::DefaultObjectId )
......@@ -527,14 +527,14 @@ void SharedMemory::readEventList( std::string oname )
xmlNode* enode = conf->getNode(oname);
if( enode == NULL )
{
dlog[Debug::WARN] << myname << "(readEventList): " << oname << " не найден..." << endl;
dlog.warn() << myname << "(readEventList): " << oname << " не найден..." << endl;
return;
}
UniXML_iterator it(enode);
if( !it.goChildren() )
{
dlog[Debug::WARN] << myname << "(readEventList): <eventlist> пустой..." << endl;
dlog.warn() << myname << "(readEventList): <eventlist> пустой..." << endl;
return;
}
......@@ -546,12 +546,12 @@ void SharedMemory::readEventList( std::string oname )
ObjectId oid = it.getIntProp("id");
if( oid != 0 )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(readEventList): add " << it.getProp("name") << endl;
if( dlog.is_info() )
dlog.info() << myname << "(readEventList): add " << it.getProp("name") << endl;
elst.push_back(oid);
}
else
dlog[Debug::CRIT] << myname << "(readEventList): Не найден ID для "
dlog.crit() << myname << "(readEventList): Не найден ID для "
<< it.getProp("name") << endl;
}
}
......@@ -575,7 +575,7 @@ void SharedMemory::sendEvent( UniSetTypes::SystemMessage& sm )
}
if(!ok)
dlog[Debug::CRIT] << myname << "(sendEvent): Объект " << (*it) << " НЕДОСТУПЕН" << endl;
dlog.crit() << myname << "(sendEvent): Объект " << (*it) << " НЕДОСТУПЕН" << endl;
}
}
// -----------------------------------------------------------------------------
......@@ -592,20 +592,20 @@ void SharedMemory::loggingInfo( SensorMessage& sm )
// -----------------------------------------------------------------------------
void SharedMemory::buildHistoryList( xmlNode* cnode )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(buildHistoryList): ..." << endl;
if( dlog.is_info() )
dlog.info() << myname << "(buildHistoryList): ..." << endl;
UniXML* xml = conf->getConfXML();
if( !xml )
{
dlog[Debug::WARN] << myname << "(buildHistoryList): xml=NULL?!" << endl;
dlog.warn() << myname << "(buildHistoryList): xml=NULL?!" << endl;
return;
}
xmlNode* n = xml->extFindNode(cnode,1,1,"History","");
if( !n )
{
dlog[Debug::WARN] << myname << "(buildHistoryList): <History> not found. ignore..." << endl;
dlog.warn() << myname << "(buildHistoryList): <History> not found. ignore..." << endl;
hist.clear();
return;
}
......@@ -615,7 +615,7 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
bool no_history = conf->getArgInt("--sm-no-history",it.getProp("no_history"));
if( no_history )
{
dlog[Debug::WARN] << myname << "(buildHistoryList): no_history='1'.. history skipped..." << endl;
dlog.warn() << myname << "(buildHistoryList): no_history='1'.. history skipped..." << endl;
hist.clear();
return;
}
......@@ -626,7 +626,7 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
if( !it.goChildren() )
{
dlog[Debug::WARN] << myname << "(buildHistoryList): <History> empty. ignore..." << endl;
dlog.warn() << myname << "(buildHistoryList): <History> empty. ignore..." << endl;
return;
}
......@@ -645,7 +645,7 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
hi.fuse_id = conf->getSensorID(it.getProp("fuse_id"));
if( hi.fuse_id == DefaultObjectId )
{
dlog[Debug::WARN] << myname << "(buildHistory): not found sensor ID for "
dlog.warn() << myname << "(buildHistory): not found sensor ID for "
<< it.getProp("fuse_id")
<< " history item id=" << it.getProp("id")
<< " ..ignore.." << endl;
......@@ -661,7 +661,7 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
hi.fuse_val = it.getIntProp("fuse_value");
}
dlog[Debug::INFO] << myname << "(buildHistory): add fuse_id=" << hi.fuse_id
dlog.info() << myname << "(buildHistory): add fuse_id=" << hi.fuse_id
<< " fuse_val=" << hi.fuse_val
<< " fuse_use_val=" << hi.fuse_use_val
<< " fuse_invert=" << hi.fuse_invert
......@@ -672,8 +672,8 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
hist.push_back(hi);
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(buildHistoryList): history logs count=" << hist.size() << endl;
if( dlog.is_info() )
dlog.info() << myname << "(buildHistoryList): history logs count=" << hist.size() << endl;
}
// -----------------------------------------------------------------------------
void SharedMemory::checkHistoryFilter( UniXML_iterator& xit )
......@@ -695,7 +695,7 @@ void SharedMemory::checkHistoryFilter( UniXML_iterator& xit )
ai.id = conf->getSensorID(xit.getProp("name"));
if( ai.id == DefaultObjectId )
{
dlog[Debug::WARN] << myname << "(checkHistoryFilter): not found sensor ID for " << xit.getProp("name") << endl;
dlog.warn() << myname << "(checkHistoryFilter): not found sensor ID for " << xit.getProp("name") << endl;
continue;
}
......@@ -712,8 +712,8 @@ void SharedMemory::saveHistory()
{
if( hist.empty() )
return;
// if( dlog.debugging(Debug::INFO) )
// dlog[Debug::INFO] << myname << "(saveHistory): ..." << endl;
// if( dlog.is_info() )
// dlog.info() << myname << "(saveHistory): ..." << endl;
for( History::iterator it=hist.begin(); it!=hist.end(); ++it )
{
......@@ -757,9 +757,9 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
sm_tv_usec = s_it->second.tv_usec;
}
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << myname << "(updateHistory): "
dlog.info() << myname << "(updateHistory): "
<< " sid=" << s_it->second.si.id
<< " value=" << value
<< endl;
......@@ -779,8 +779,8 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
if( st )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(updateHistory): HISTORY EVENT for " << (*it) << endl;
if( dlog.is_info() )
dlog.info() << myname << "(updateHistory): HISTORY EVENT for " << (*it) << endl;
it->fuse_sec = sm_tv_sec;
it->fuse_usec = sm_tv_usec;
......@@ -800,8 +800,8 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
if( !st )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(updateHistory): HISTORY EVENT for " << (*it) << endl;
if( dlog.is_info() )
dlog.info() << myname << "(updateHistory): HISTORY EVENT for " << (*it) << endl;
it->fuse_sec = sm_tv_sec;
it->fuse_usec = sm_tv_usec;
......@@ -813,11 +813,8 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
{
if( value == it->fuse_val )
{
bool st = it->fuse_invert ? !sm->state : sm->state;
if( !st )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(updateHistory): HISTORY EVENT for " << (*it) << endl;
if( dlog.is_info() )
dlog.info() << myname << "(updateHistory): HISTORY EVENT for " << (*it) << endl;
it->fuse_sec = sm_tv_sec;
it->fuse_usec = sm_tv_usec;
......
extensions/SharedMemory/smemory.cc
View file @ dc1fabfe
......@@ -25,7 +25,7 @@ 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 );
ulog.logFile( logname );
dlog.logFile( logname );
SharedMemory* shm = SharedMemory::init_smemory(argc, argv);
......@@ -44,19 +44,19 @@ int main(int argc, const char **argv)
}
catch( SystemError& err )
{
unideb[Debug::CRIT] << "(smemory): " << err << endl;
ulog.crit() << "(smemory): " << err << endl;
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << "(smemory): " << ex << endl;
ulog.crit() << "(smemory): " << ex << endl;
}
catch( std::exception& e )
{
unideb[Debug::CRIT] << "(smemory): " << e.what() << endl;
ulog.crit() << "(smemory): " << e.what() << endl;
}
catch(...)
{
unideb[Debug::CRIT] << "(smemory): catch(...)" << endl;
ulog.crit() << "(smemory): catch(...)" << endl;
}
return 1;
......
extensions/SharedMemoryPlus/smemory-plus.cc
View file @ dc1fabfe
......@@ -52,7 +52,7 @@ int main( int argc, const char **argv )
string logfilename = conf->getArgParam("--logfile", "smemory-plus.log");
string logname( conf->getLogDir() + logfilename );
UniSetExtensions::dlog.logFile( logname );
unideb.logFile( logname );
ulog.logFile( logname );
conf->initDebug(UniSetExtensions::dlog,"dlog");
ObjectsActivator act;
......@@ -79,8 +79,8 @@ int main( int argc, const char **argv )
p << "io";
if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add IOControl(" << p.str() << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(smemory-plus): add IOControl(" << p.str() << ")" << endl;
IOControl* ic = IOControl::init_iocontrol(argc,argv,shm->getId(),shm,p.str());
if( ic == NULL )
......@@ -108,8 +108,8 @@ int main( int argc, const char **argv )
p << "rtu";
if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add RTUExchange(" << p.str() << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(smemory-plus): add RTUExchange(" << p.str() << ")" << endl;
RTUExchange* rtu = RTUExchange::init_rtuexchange(argc,argv,shm->getId(),shm,p.str());
if( rtu == NULL )
......@@ -132,8 +132,8 @@ int main( int argc, const char **argv )
p << "mbs";
if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add MBSlave(" << p.str() << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(smemory-plus): add MBSlave(" << p.str() << ")" << endl;
MBSlave* mbs = MBSlave::init_mbslave(argc,argv,shm->getId(),shm,p.str());
if( mbs == NULL )
......@@ -158,8 +158,8 @@ int main( int argc, const char **argv )
p << "mbtcp";
if( i > 0 ) p << i;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add MBTCPMaster(" << p.str() << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(smemory-plus): add MBTCPMaster(" << p.str() << ")" << endl;
MBTCPMaster* mbm1 = MBTCPMaster::init_mbmaster(argc,argv,shm->getId(),shm,p.str());
if( mbm1 == NULL )
......@@ -176,8 +176,8 @@ int main( int argc, const char **argv )
if( unet == NULL )
return 1;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(smemory-plus): add UNetExchnage.." << endl;
if( dlog.is_info() )
dlog.info() << "(smemory-plus): add UNetExchnage.." << endl;
act.addObject(static_cast<class UniSetObject*>(unet));
}
......@@ -198,15 +198,15 @@ int main( int argc, const char **argv )
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << "(smemory-plus): " << ex << endl;
ulog.crit() << "(smemory-plus): " << ex << endl;
}
catch( CORBA::SystemException& ex )
{
unideb[Debug::CRIT] << "(smemory-plus): " << ex.NP_minorString() << endl;
ulog.crit() << "(smemory-plus): " << ex.NP_minorString() << endl;
}
catch(...)
{
unideb[Debug::CRIT] << "(smemory-plus): catch(...)" << endl;
ulog.crit() << "(smemory-plus): catch(...)" << endl;
}
on_sigchild(SIGTERM);
......
extensions/UNetUDP/UNetExchange.cc
View file @ dc1fabfe
......@@ -30,12 +30,12 @@ sender2(0)
// определяем фильтр
s_field = conf->getArgParam("--" + prefix + "-filter-field");
s_fvalue = conf->getArgParam("--" + prefix + "-filter-value");
dlog[Debug::INFO] << myname << "(init): read filter-field='" << s_field
dlog.info() << myname << "(init): read filter-field='" << s_field
<< "' filter-value='" << s_fvalue << "'" << endl;
const string n_field(conf->getArgParam("--" + prefix + "-nodes-filter-field"));
const string n_fvalue(conf->getArgParam("--" + prefix + "-nodes-filter-value"));
dlog[Debug::INFO] << myname << "(init): read nodes-filter-field='" << n_field
dlog.info() << myname << "(init): read nodes-filter-field='" << n_field
<< "' nodes-filter-value='" << n_fvalue << "'" << endl;
int recvTimeout = conf->getArgPInt("--" + prefix + "-recv-timeout",it.getProp("recvTimeout"), 5000);
......@@ -66,7 +66,7 @@ sender2(0)
{
if( n_it.getIntProp("unet_ignore") )
{
dlog[Debug::INFO] << myname << "(init): unet_ignore.. for " << n_it.getProp("name") << endl;
dlog.info() << myname << "(init): unet_ignore.. for " << n_it.getProp("name") << endl;
continue;
}
......@@ -92,12 +92,13 @@ sender2(0)
{
ostringstream err;
err << myname << "(init): Unknown broadcast IP for " << n_it.getProp("name");
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw UniSetTypes::SystemError(err.str());
}
if( h2.empty() && dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(init): ip2 not used..." << endl;
if( h2.empty() && dlog.is_info() )
dlog.info() << myname << "(init): ip2 not used..." << endl;
// Если указано поле unet_port - используем его
// Иначе port = идентификатору узла
......@@ -114,12 +115,15 @@ sender2(0)
{
if( no_sender )
{
dlog[Debug::INFO] << myname << "(init): sender OFF for this node...("
if( dlog.is_info() )
dlog.info() << myname << "(init): sender OFF for this node...("
<< n_it.getProp("name") << ")" << endl;
continue;
}
dlog[Debug::INFO] << myname << "(init): init sender.. my node " << n_it.getProp("name") << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): init sender.. my node " << n_it.getProp("name") << endl;
sender = new UNetSender(h,p,shm,s_field,s_fvalue,ic);
sender->setSendPause(sendpause);
......@@ -128,7 +132,8 @@ sender2(0)
// создаём "писателя" для второго канала если задан
if( !h2.empty() )
{
dlog[Debug::INFO] << myname << "(init): init sender2.. my node " << n_it.getProp("name") << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): init sender2.. my node " << n_it.getProp("name") << endl;
sender2 = new UNetSender(h2,p2,shm,s_field,s_fvalue,ic);
sender2->setSendPause(sendpause);
}
......@@ -138,17 +143,19 @@ sender2(0)
// т.е. это "резервный канал", то игнорируем ошибку его создания
// при запуске "интерфейс" может быть и не доступен...
sender2 = 0;
dlog[Debug::CRIT] << myname << "(ignore): DON`T CREATE 'UNetSender' for " << h2 << ":" << p2 << endl;
dlog.crit() << myname << "(ignore): DON`T CREATE 'UNetSender' for " << h2 << ":" << p2 << endl;
}
continue;
}
dlog[Debug::INFO] << myname << "(init): add UNetReceiver for " << h << ":" << p << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): add UNetReceiver for " << h << ":" << p << endl;
if( checkExistUNetHost(h,p) )
{
dlog[Debug::INFO] << myname << "(init): " << h << ":" << p << " already added! Ignore.." << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): " << h << ":" << p << " already added! Ignore.." << endl;
continue;
}
......@@ -163,7 +170,8 @@ sender2(0)
{
ostringstream err;
err << myname << ": Unknown RespondID.. Not found id for '" << s_resp_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -177,7 +185,8 @@ sender2(0)
{
ostringstream err;
err << myname << ": Unknown RespondID(2).. Not found id for '" << s_resp2_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -191,7 +200,8 @@ sender2(0)
{
ostringstream err;
err << myname << ": Unknown LostPacketsID.. Not found id for '" << s_lp_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -205,7 +215,8 @@ sender2(0)
{
ostringstream err;
err << myname << ": Unknown LostPacketsID(2).. Not found id for '" << s_lp2_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -219,7 +230,8 @@ sender2(0)
{
ostringstream err;
err << myname << ": Unknown LostPacketsID(comm).. Not found id for '" << s_lp_comm_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -233,14 +245,16 @@ sender2(0)
{
ostringstream err;
err << myname << ": Unknown RespondID(comm).. Not found id for '" << s_resp_comm_id << "'" << endl;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
dlog[Debug::INFO] << myname << "(init): (node='" << n << "') add receiver "
if( dlog.is_info() )
dlog.info() << myname << "(init): (node='" << n << "') add receiver "
<< h2 << ":" << p2 << endl;
UNetReceiver* r = new UNetReceiver(h,p,shm);
// на всякий принудительно разблокируем,
......@@ -263,7 +277,8 @@ sender2(0)
{
if( !h2.empty() ) // создаём читателя впо второму каналу
{
dlog[Debug::INFO] << myname << "(init): (node='" << n << "') add reserv receiver "
if( dlog.is_info() )
dlog.info() << myname << "(init): (node='" << n << "') add reserv receiver "
<< h2 << ":" << p2 << endl;
r2 = new UNetReceiver(h2,p2,shm);
......@@ -287,7 +302,8 @@ sender2(0)
// т.е. это "резервный канал", то игнорируем ошибку его создания
// при запуске "интерфейс" может быть и не доступен...
r2 = 0;
dlog[Debug::CRIT] << myname << "(ignore): DON`T CREATE 'UNetReceiver' for " << h2 << ":" << p2 << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(ignore): DON`T CREATE 'UNetReceiver' for " << h2 << ":" << p2 << endl;
}
ReceiverInfo ri(r,r2);
......@@ -306,7 +322,8 @@ sender2(0)
{
ostringstream err;
err << myname << ": не найден идентификатор для датчика 'HeartBeat' " << heart;
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
......@@ -326,12 +343,14 @@ sender2(0)
{
ostringstream err;
err << myname << "(init): test_id unknown. 'TestMode_S' not found...";
dlog[Debug::CRIT] << myname << "(init): " << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(init): " << err.str() << endl;
throw SystemError(err.str());
}
}
dlog[Debug::INFO] << myname << "(init): test_id=" << test_id << endl;
if( dlog.is_info() )
dlog.info() << myname << "(init): test_id=" << test_id << endl;
activateTimeout = conf->getArgPInt("--" + prefix + "-activate-timeout", 20000);
}
......@@ -387,7 +406,8 @@ void UNetExchange::waitSMReady()
{
ostringstream err;
err << myname << "(waitSMReady): Не дождались готовности SharedMemory к работе в течение " << ready_timeout << " мсек";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
}
......@@ -415,7 +435,8 @@ void UNetExchange::step()
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(step): (hb) " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(step): (hb) " << ex << std::endl;
}
}
......@@ -439,7 +460,8 @@ void UNetExchange::ReceiverInfo::step( SMInterface* shm, const std::string& myna
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(ReceiverInfo::step): (respond): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(ReceiverInfo::step): (respond): " << ex << std::endl;
}
try
......@@ -457,7 +479,8 @@ void UNetExchange::ReceiverInfo::step( SMInterface* shm, const std::string& myna
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(ReceiverInfo::step): (lostpackets): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(ReceiverInfo::step): (lostpackets): " << ex << std::endl;
}
}
// -----------------------------------------------------------------------------
......@@ -494,17 +517,20 @@ void UNetExchange::processingMessage( UniSetTypes::VoidMessage *msg )
}
catch( SystemError& ex )
{
dlog[Debug::CRIT] << myname << "(SystemError): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(SystemError): " << ex << std::endl;
// throw SystemError(ex);
raise(SIGTERM);
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << myname << "(processingMessage): " << ex << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(processingMessage): catch ..." << std::endl;
if( dlog.is_crit() )
dlog.crit() << myname << "(processingMessage): catch ..." << std::endl;
}
}
// -----------------------------------------------------------------------------
......@@ -528,8 +554,8 @@ void UNetExchange::sysCommand( UniSetTypes::SystemMessage *sm )
break;
}
if( !activated )
dlog[Debug::CRIT] << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
if( !activated && dlog.is_crit() )
dlog.crit() << myname << "(sysCommand): ************* don`t activate?! ************" << endl;
{
UniSetTypes::uniset_rwmutex_rlock l(mutex_start);
......@@ -567,12 +593,12 @@ void UNetExchange::sysCommand( UniSetTypes::SystemMessage *sm )
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb << myname << "(sysCommand): logRotate" << std::endl;
string fname = unideb.getLogFile();
ulog << myname << "(sysCommand): logRotate" << std::endl;
string fname(ulog.getLogFile());
if( !fname.empty() )
{
unideb.logFile(fname);
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
ulog.logFile(fname);
ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << std::endl;
}
dlog << myname << "(sysCommand): logRotate" << std::endl;
......@@ -599,7 +625,9 @@ void UNetExchange::askSensors( UniversalIO::UIOCommand cmd )
<< "(askSensors): Не дождались готовности(work) SharedMemory к работе в течение "
<< activateTimeout << " мсек";
dlog[Debug::CRIT] << err.str() << endl;
if( dlog.is_crit() )
dlog.crit() << err.str() << endl;
kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
throw SystemError(err.str());
}
......@@ -636,7 +664,8 @@ bool UNetExchange::activateObject()
// ------------------------------------------------------------------------------------------
void UNetExchange::sigterm( int signo )
{
dlog[Debug::INFO] << myname << ": ********* SIGTERM(" << signo <<") ********" << endl;
if( dlog.is_info() )
dlog.info() << myname << ": ********* SIGTERM(" << signo <<") ********" << endl;
activated = false;
for( ReceiverList::iterator it=recvlist.begin(); it!=recvlist.end(); ++it )
{
......@@ -720,7 +749,8 @@ UNetExchange* UNetExchange::init_unetexchange( int argc, const char* argv[], Uni
return 0;
}
dlog[Debug::INFO] << "(unetexchange): name = " << name << "(" << ID << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(unetexchange): name = " << name << "(" << ID << ")" << endl;
return new UNetExchange(ID,icID,ic,prefix);
}
// -----------------------------------------------------------------------------
......@@ -744,8 +774,8 @@ void UNetExchange::receiverEvent( UNetReceiver* r, UNetReceiver::Event ev )
it->r1->setLockUpdate(true);
it->r2->setLockUpdate(false);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(event): " << r->getName()
if( dlog.is_info() )
dlog.info() << myname << "(event): " << r->getName()
<< ": timeout for channel1.. select channel 2" << endl;
return;
}
......@@ -757,8 +787,8 @@ void UNetExchange::receiverEvent( UNetReceiver* r, UNetReceiver::Event ev )
it->r1->setLockUpdate(false);
it->r2->setLockUpdate(true);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(event): " << r->getName()
if( dlog.is_info() )
dlog.info() << myname << "(event): " << r->getName()
<< ": timeout for channel2.. select channel 1" << endl;
return;
}
......
extensions/UNetUDP/UNetReceiver.cc
View file @ dc1fabfe
......@@ -64,14 +64,14 @@ a_cache_init_ok(false)
{
ostringstream s;
s << myname << ": " << e.what();
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
throw SystemError(s.str());
}
catch( ... )
{
ostringstream s;
s << myname << ": catch...";
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
throw SystemError(s.str());
}
......@@ -177,11 +177,11 @@ void UNetReceiver::update()
}
catch( UniSetTypes::Exception& ex)
{
dlog[Debug::CRIT] << myname << "(update): " << ex << std::endl;
dlog.crit() << myname << "(update): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(update): catch ..." << std::endl;
dlog.crit() << myname << "(update): catch ..." << std::endl;
}
if( sidRespond!=DefaultObjectId )
......@@ -193,7 +193,7 @@ void UNetReceiver::update()
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(step): (respond) " << ex << std::endl;
dlog.crit() << myname << "(step): (respond) " << ex << std::endl;
}
}
......@@ -205,7 +205,7 @@ void UNetReceiver::update()
}
catch(Exception& ex)
{
dlog[Debug::CRIT] << myname << "(step): (lostPackets) " << ex << std::endl;
dlog.crit() << myname << "(step): (lostPackets) " << ex << std::endl;
}
}
......@@ -286,7 +286,7 @@ void UNetReceiver::real_update()
ItemInfo& ii(d_icache[i]);
if( ii.id != id )
{
dlog[Debug::WARN] << myname << "(update): reinit cache for sid=" << id << endl;
dlog.warn() << myname << "(update): reinit cache for sid=" << id << endl;
ii.id = id;
shm->initIterator(ii.ioit);
}
......@@ -302,11 +302,11 @@ void UNetReceiver::real_update()
}
catch( UniSetTypes::Exception& ex)
{
dlog[Debug::CRIT] << myname << "(update): " << ex << std::endl;
dlog.crit() << myname << "(update): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(update): catch ..." << std::endl;
dlog.crit() << myname << "(update): catch ..." << std::endl;
}
}
......@@ -319,7 +319,7 @@ void UNetReceiver::real_update()
ItemInfo& ii(a_icache[i]);
if( ii.id != d.id )
{
dlog[Debug::WARN] << myname << "(update): reinit cache for sid=" << d.id << endl;
dlog.warn() << myname << "(update): reinit cache for sid=" << d.id << endl;
ii.id = d.id;
shm->initIterator(ii.ioit);
}
......@@ -335,11 +335,11 @@ void UNetReceiver::real_update()
}
catch( UniSetTypes::Exception& ex)
{
dlog[Debug::CRIT] << myname << "(update): " << ex << std::endl;
dlog.crit() << myname << "(update): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << myname << "(update): catch ..." << std::endl;
dlog.crit() << myname << "(update): catch ..." << std::endl;
}
}
}
......@@ -356,8 +356,8 @@ void UNetReceiver::stop()
// -----------------------------------------------------------------------------
void UNetReceiver::receive()
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << ": ******************* receive start" << endl;
if( dlog.is_info() )
dlog.info() << myname << ": ******************* receive start" << endl;
{
uniset_rwmutex_wrlock l(tmMutex);
......@@ -377,18 +377,18 @@ void UNetReceiver::receive()
}
catch( UniSetTypes::Exception& ex)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(receive): " << ex << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(receive): " << ex << std::endl;
}
catch( std::exception& e )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(receive): " << e.what()<< std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(receive): " << e.what()<< std::endl;
}
catch(...)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << myname << "(receive): catch ..." << std::endl;
if( dlog.is_warn() )
dlog.warn() << myname << "(receive): catch ..." << std::endl;
}
// делаем через промежуточную переменную
......@@ -410,8 +410,8 @@ void UNetReceiver::receive()
msleep(recvpause);
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << ": ************* receive FINISH **********" << endl;
if( dlog.is_info() )
dlog.info() << myname << ": ************* receive FINISH **********" << endl;
}
// -----------------------------------------------------------------------------
bool UNetReceiver::recv()
......@@ -424,7 +424,7 @@ bool UNetReceiver::recv()
size_t sz = UniSetUDP::UDPMessage::getMessage(pack,r_buf);
if( sz == 0 )
{
dlog[Debug::CRIT] << myname << "(receive): FAILED RECEIVE DATA ret=" << ret << endl;
dlog.crit() << myname << "(receive): FAILED RECEIVE DATA ret=" << ret << endl;
return false;
}
......@@ -439,7 +439,7 @@ bool UNetReceiver::recv()
// Обычно "кольцевой". Т.е. если не успели обработать и "вынуть" из буфера информацию.. он будет переписан новыми данными
if( waitClean )
{
dlog[Debug::CRIT] << myname << "(receive): reset qtmp.." << endl;
dlog.crit() << myname << "(receive): reset qtmp.." << endl;
while( !qtmp.empty() )
qtmp.pop();
}
......@@ -510,7 +510,7 @@ void UNetReceiver::initDCache( UniSetUDP::UDPMessage& pack, bool force )
if( !force && pack.dcount == d_icache.size() )
return;
dlog[Debug::INFO] << myname << ": init icache.." << endl;
dlog.info() << myname << ": init icache.." << endl;
d_cache_init_ok = true;
d_icache.resize(pack.dcount);
......@@ -532,7 +532,7 @@ void UNetReceiver::initACache( UniSetUDP::UDPMessage& pack, bool force )
if( !force && pack.acount == a_icache.size() )
return;
dlog[Debug::INFO] << myname << ": init icache.." << endl;
dlog.info() << myname << ": init icache.." << endl;
a_cache_init_ok = true;
a_icache.resize(pack.acount);
......
extensions/UNetUDP/UNetSender.cc
View file @ dc1fabfe
......@@ -31,11 +31,11 @@ s_thr(0)
// определяем фильтр
// s_field = conf->getArgParam("--udp-filter-field");
// s_fvalue = conf->getArgParam("--udp-filter-value");
dlog[Debug::INFO] << myname << "(init): read filter-field='" << s_field
dlog.info() << myname << "(init): read filter-field='" << s_field
<< "' filter-value='" << s_fvalue << "'" << endl;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(UNetSender): UDP set to " << s_host << ":" << port << endl;
if( dlog.is_info() )
dlog.info() << "(UNetSender): UDP set to " << s_host << ":" << port << endl;
ost::Thread::setException(ost::Thread::throwException);
try
......@@ -47,14 +47,14 @@ s_thr(0)
{
ostringstream s;
s << myname << ": " << e.what();
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
throw SystemError(s.str());
}
catch( ... )
{
ostringstream s;
s << myname << ": catch...";
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
throw SystemError(s.str());
}
......@@ -65,7 +65,7 @@ s_thr(0)
{
readConfiguration();
dlist.resize(maxItem);
dlog[Debug::INFO] << myname << "(init): dlist size = " << dlist.size() << endl;
dlog.info() << myname << "(init): dlist size = " << dlist.size() << endl;
}
else
ic->addReadItem( sigc::mem_fun(this,&UNetSender::readItem) );
......@@ -130,7 +130,7 @@ void UNetSender::updateItem( DMap::iterator& it, long value )
void UNetSender::send()
{
dlist.resize(maxItem);
dlog[Debug::INFO] << myname << "(send): dlist size = " << dlist.size() << endl;
dlog.info() << myname << "(send): dlist size = " << dlist.size() << endl;
/*
ost::IPV4Broadcast h = s_host.c_str();
try
......@@ -141,7 +141,7 @@ void UNetSender::send()
{
ostringstream s;
s << e.getString() << ": " << e.getSystemErrorString();
dlog[Debug::CRIT] << myname << "(poll): " << s.str() << endl;
dlog.crit() << myname << "(poll): " << s.str() << endl;
throw SystemError(s.str());
}
*/
......@@ -156,25 +156,25 @@ void UNetSender::send()
}
catch( ost::SockException& e )
{
dlog[Debug::WARN] << myname << "(send): " << e.getString() << endl;
dlog.warn() << myname << "(send): " << e.getString() << endl;
}
catch( UniSetTypes::Exception& ex)
{
dlog[Debug::WARN] << myname << "(send): " << ex << std::endl;
dlog.warn() << myname << "(send): " << ex << std::endl;
}
catch( std::exception& e )
{
dlog[Debug::WARN] << myname << "(send): " << e.what() << std::endl;
dlog.warn() << myname << "(send): " << e.what() << std::endl;
}
catch(...)
{
dlog[Debug::WARN] << myname << "(send): catch ..." << std::endl;
dlog.warn() << myname << "(send): catch ..." << std::endl;
}
msleep(sendpause);
}
dlog[Debug::INFO] << "************* execute FINISH **********" << endl;
dlog.info() << "************* execute FINISH **********" << endl;
}
// -----------------------------------------------------------------------------
void UNetSender::real_send()
......@@ -191,7 +191,7 @@ void UNetSender::real_send()
mypack.transport_msg(s_msg);
size_t ret = udp->send( (char*)s_msg.data, s_msg.len );
if( ret < s_msg.len )
dlog[Debug::CRIT] << myname << "(real_send): FAILED ret=" << ret << " < sizeof=" << s_msg.len << endl;
dlog.crit() << myname << "(real_send): FAILED ret=" << ret << " < sizeof=" << s_msg.len << endl;
}
// -----------------------------------------------------------------------------
void UNetSender::stop()
......@@ -259,7 +259,7 @@ bool UNetSender::initItem( UniXML_iterator& it )
if( sid == DefaultObjectId )
{
if( dlog )
dlog[Debug::CRIT] << myname << "(readItem): ID not found for "
dlog.crit() << myname << "(readItem): ID not found for "
<< sname << endl;
return false;
}
......@@ -269,7 +269,7 @@ bool UNetSender::initItem( UniXML_iterator& it )
if( p.iotype == UniversalIO::UnknownIOType )
{
dlog[Debug::CRIT] << myname << "(readItem): Unknown iotype for sid=" << sid << endl;
dlog.crit() << myname << "(readItem): Unknown iotype for sid=" << sid << endl;
return false;
}
......@@ -280,7 +280,7 @@ bool UNetSender::initItem( UniXML_iterator& it )
p.pack_ind = mypack.addDData(sid,0);
if ( p.pack_ind >= UniSetUDP::MaxDCount )
{
dlog[Debug::CRIT] << myname
dlog.crit() << myname
<< "(readItem): OVERFLOW! MAX UDP DIGITAL DATA LIMIT! max="
<< UniSetUDP::MaxDCount << endl;
......@@ -293,7 +293,7 @@ bool UNetSender::initItem( UniXML_iterator& it )
p.pack_ind = mypack.addAData(sid,0);
if ( p.pack_ind >= UniSetUDP::MaxACount )
{
dlog[Debug::CRIT] << myname
dlog.crit() << myname
<< "(readItem): OVERFLOW! MAX UDP ANALOG DATA LIMIT! max="
<< UniSetUDP::MaxACount << endl;
raise(SIGTERM);
......@@ -307,8 +307,8 @@ bool UNetSender::initItem( UniXML_iterator& it )
dlist[maxItem] = p;
maxItem++;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << "(initItem): add " << p << endl;
if( dlog.is_info() )
dlog.info() << myname << "(initItem): add " << p << endl;
return true;
}
......
extensions/UNetUDP/unetexchange.cc
View file @ dc1fabfe
......@@ -32,7 +32,7 @@ int main( int argc, const char** argv )
std::ostringstream logname;
string dir(conf->getLogDir());
logname << dir << logfilename;
unideb.logFile( logname.str() );
ulog.logFile( logname.str() );
UniSetExtensions::dlog.logFile( logname.str() );
conf->initDebug(UniSetExtensions::dlog,"dlog");
......@@ -52,7 +52,7 @@ int main( int argc, const char** argv )
UNetExchange* unet = UNetExchange::init_unetexchange(argc,argv,shmID);
if( !unet )
{
dlog[Debug::CRIT] << "(unetexchange): init failed.." << endl;
dlog.crit() << "(unetexchange): init failed.." << endl;
return 1;
}
......@@ -62,21 +62,21 @@ int main( int argc, const char** argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
unideb(Debug::ANY) << "\n\n\n";
unideb[Debug::ANY] << "(main): -------------- UDPRecevier START -------------------------\n\n";
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- UDPReceiver START -------------------------\n\n";
ulog << "\n\n\n";
ulog << "(main): -------------- UDPRecevier START -------------------------\n\n";
dlog << "\n\n\n";
dlog << "(main): -------------- UDPReceiver START -------------------------\n\n";
act.run(false);
while( waitpid(-1, 0, 0) > 0 );
}
catch( Exception& ex )
{
dlog[Debug::CRIT] << "(unetexchange): " << ex << std::endl;
dlog.crit() << "(unetexchange): " << ex << std::endl;
}
catch(...)
{
dlog[Debug::CRIT] << "(unetexchange): catch ..." << std::endl;
dlog.crit() << "(unetexchange): catch ..." << std::endl;
}
while( waitpid(-1, 0, 0) > 0 );
......
extensions/UniNetwork/UniExchange.cc
View file @ dc1fabfe
......@@ -36,18 +36,18 @@ smReadyTimeout(15000)
s_field = conf->getArgParam("--" + prefix + "-filter-field");
s_fvalue = conf->getArgParam("--" + prefix + "-filter-value");
dlog[Debug::INFO] << myname << "(init): read fileter-field='" << s_field
dlog.info() << myname << "(init): read fileter-field='" << s_field
<< "' filter-value='" << s_fvalue << "'" << endl;
polltime = conf->getArgInt("--" + prefix + "-polltime",it.getProp("polltime"));
if( polltime <= 0 )
polltime = 200;
dlog[Debug::INFO] << myname << "(init): polltime=" << polltime << endl;
dlog.info() << myname << "(init): polltime=" << polltime << endl;
int updatetime = conf->getArgInt("--" + prefix + "-updatetime",it.getProp("updatetime"));
if( updatetime <= 0 )
updatetime = 200;
dlog[Debug::INFO] << myname << "(init): updatetime=" << polltime << endl;
dlog.info() << myname << "(init): updatetime=" << polltime << endl;
ptUpdate.setTiming(updatetime);
......@@ -57,7 +57,7 @@ smReadyTimeout(15000)
else if( smReadyTimeout < 0 )
smReadyTimeout = UniSetTimer::WaitUpTime;
dlog[Debug::INFO] << myname << "(init): smReadyTimeout=" << smReadyTimeout << endl;
dlog.info() << myname << "(init): smReadyTimeout=" << smReadyTimeout << endl;
if( it.goChildren() )
{
......@@ -97,7 +97,7 @@ smReadyTimeout(15000)
ni.node = node;
ni.sidConnection = conf->getSensorID(it.getProp("sid_connection"));
dlog[Debug::INFO] << myname << ": add point " << n << ":" << n1 << endl;
dlog.info() << myname << ": add point " << n << ":" << n1 << endl;
nlst.push_back(ni);
}
}
......@@ -127,7 +127,7 @@ void UniExchange::execute()
err << myname << "(execute): Не дождались готовности SharedMemory к работе в течение "
<< smReadyTimeout << " мсек";
unideb[Debug::CRIT] << err.str() << endl;
ulog.crit() << err.str() << endl;
throw SystemError(err.str());
}
......@@ -150,23 +150,23 @@ void UniExchange::execute()
bool ok = false;
try
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << ": connect to id=" << it->id << " node=" << it->node << endl;
if( dlog.is_info() )
dlog.info() << myname << ": connect to id=" << it->id << " node=" << it->node << endl;
IOController_i::ShortMapSeq_var sseq = ui.getSensors( it->id, it->node );
ok = true;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << " update sensors from id=" << it->id << " node=" << it->node << endl;
if( dlog.is_info() )
dlog.info() << myname << " update sensors from id=" << it->id << " node=" << it->node << endl;
it->update(sseq,shm);
}
catch( Exception& ex )
{
dlog[Debug::INFO] << myname << "(execute): " << ex << endl;
dlog.info() << myname << "(execute): " << ex << endl;
}
catch( ... )
{
dlog[Debug::INFO] << myname << "(execute): catch ..." << endl;
dlog.info() << myname << "(execute): catch ..." << endl;
}
if( it->sidConnection != DefaultObjectId )
......@@ -177,15 +177,15 @@ void UniExchange::execute()
}
catch(...)
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT]<< myname << "(execute): sensor not avalible "
if( dlog.is_crit() )
dlog.crit()<< myname << "(execute): sensor not avalible "
<< conf->oind->getNameById( it->sidConnection)
<< endl;
}
}
if( !ok && dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << myname << ": ****** cannot connect with node=" << it->node << endl;
if( !ok && dlog.is_info() )
dlog.info() << myname << ": ****** cannot connect with node=" << it->node << endl;
}
if( ptUpdate.checkTime() )
......@@ -234,11 +234,11 @@ void UniExchange::NetNodeInfo::update( IOController_i::ShortMapSeq_var& map, SMI
}
catch( Exception& ex )
{
dlog[Debug::INFO] << "(update): " << ex << endl;
dlog.info() << "(update): " << ex << endl;
}
catch( ... )
{
dlog[Debug::INFO] << "(update): catch ..." << endl;
dlog.info() << "(update): catch ..." << endl;
}
}
}
......@@ -278,11 +278,11 @@ void UniExchange::updateLocalData()
}
catch( Exception& ex )
{
dlog[Debug::WARN] << "(update): " << ex << endl;
dlog.warn() << "(update): " << ex << endl;
}
catch( ... )
{
dlog[Debug::WARN] << "(update): catch ..." << endl;
dlog.warn() << "(update): catch ..." << endl;
}
}
......@@ -444,7 +444,7 @@ bool UniExchange::initItem( UniXML_iterator& it )
if( i.id == DefaultObjectId )
{
if( dlog )
dlog[Debug::CRIT] << myname << "(initItem): Unknown ID for "
dlog.crit() << myname << "(initItem): Unknown ID for "
<< it.getProp("name") << endl;
return false;
}
......@@ -453,7 +453,7 @@ bool UniExchange::initItem( UniXML_iterator& it )
if( i.type == UniversalIO::UnknownIOType )
{
if( dlog )
dlog[Debug::CRIT] << myname << "(initItem): Unknown iotype= "
dlog.crit() << myname << "(initItem): Unknown iotype= "
<< it.getProp("iotype") << " for " << it.getProp("name") << endl;
return false;
}
......
extensions/UniNetwork/uninet.cc
View file @ dc1fabfe
......@@ -26,7 +26,7 @@ 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 );
ulog.logFile( logname );
dlog.logFile( logname );
ObjectId shmID = DefaultObjectId;
......@@ -58,15 +58,15 @@ int main(int argc, const char **argv)
}
catch(SystemError& err)
{
unideb[Debug::CRIT] << "(uninetwork): " << err << endl;
ulog.crit() << "(uninetwork): " << err << endl;
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << "(uninetwork): " << ex << endl;
ulog.crit() << "(uninetwork): " << ex << endl;
}
catch(...)
{
unideb[Debug::CRIT] << "(uninetwork): catch(...)" << endl;
ulog.crit() << "(uninetwork): catch(...)" << endl;
}
while( waitpid(-1, 0, 0) > 0 );
......
extensions/include/UObject_SK.h
View file @ dc1fabfe
......@@ -7,7 +7,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2013-12-15+04:00
// generate timestamp: 2013-12-17+04:00
// -----------------------------------------------------------------------------
#ifndef UObject_SK_H_
#define UObject_SK_H_
......
extensions/lib/Extensions.cc
View file @ dc1fabfe
......@@ -24,7 +24,7 @@ namespace UniSetExtensions
{
ostringstream err;
err << ": Unknown ID for '" << sname << "'" << endl;
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
throw SystemError(err.str());
}
......@@ -53,11 +53,11 @@ namespace UniSetExtensions
if( heartBeatTime <= 0 )
{
heartBeatTime = 0;
dlog[Debug::WARN] << "(getHeartBeatTime): механизм 'HEARTBEAT' ОТКЛЮЧЁН!" << endl;
dlog.warn() << "(getHeartBeatTime): механизм 'HEARTBEAT' ОТКЛЮЧЁН!" << endl;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(getHeartBeatTime): heartbeat time = " << heartBeatTime << endl;
if( dlog.is_info() )
dlog.info() << "(getHeartBeatTime): heartbeat time = " << heartBeatTime << endl;
return heartBeatTime;
}
......@@ -114,7 +114,7 @@ namespace UniSetExtensions
{
ostringstream err;
err << "(buildCalibrationDiagram): НЕ НАЙДЕН корневой узел для калибровочных диаграмм";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
throw SystemError( err.str());
}
......@@ -123,7 +123,7 @@ namespace UniSetExtensions
{
ostringstream err;
err << "(buildCalibrationDiagram): НЕ НАЙДЕНА калибровочная диаграмма '" << dname << "'";
dlog[Debug::CRIT] << err.str() << endl;
dlog.crit() << err.str() << endl;
throw SystemError( err.str());
}
......
extensions/lib/IOBase.cc
View file @ dc1fabfe
......@@ -390,8 +390,8 @@ bool IOBase::initItem( IOBase* b, UniXML_iterator& it, SMInterface* shm,
if( sid == DefaultObjectId )
{
if( dlog )
dlog[Debug::CRIT] << myname << "(readItem): (-1) Не удалось получить ID для датчика: "
if( dlog && dlog->is_crit() )
dlog->crit() << myname << "(readItem): (-1) Не удалось получить ID для датчика: "
<< sname << endl;
return false;
}
......@@ -435,8 +435,8 @@ bool IOBase::initItem( IOBase* b, UniXML_iterator& it, SMInterface* shm,
}
else
{
if( dlog )
dlog[Debug::CRIT] << myname << "(IOBase::readItem): Unknown iofront='" << front_t << "'"
if( dlog && dlog->is_crit() )
dlog->crit() << myname << "(IOBase::readItem): Unknown iofront='" << front_t << "'"
<< " for '" << sname << "'. Must be [ 01, 10 ]." << endl;
return false;
}
......@@ -447,8 +447,8 @@ bool IOBase::initItem( IOBase* b, UniXML_iterator& it, SMInterface* shm,
b->stype = UniSetTypes::getIOType(it.getProp("iotype"));
if( b->stype == UniversalIO::UnknownIOType )
{
if( dlog )
dlog[Debug::CRIT] << myname << "(IOBase::readItem): неизвестный iotype=: "
if( dlog && dlog->is_crit() )
dlog->crit() << myname << "(IOBase::readItem): неизвестный iotype=: "
<< it.getProp("iotype") << " для " << sname << endl;
return false;
}
......@@ -534,8 +534,8 @@ bool IOBase::initItem( IOBase* b, UniXML_iterator& it, SMInterface* shm,
b->t_ai = conf->getSensorID(tai);
if( b->t_ai == DefaultObjectId )
{
if( dlog )
dlog[Debug::CRIT] << myname << "(IOBase::readItem): unknown ID for threshold_ai "
if( dlog && dlog->is_crit() )
dlog->crit() << myname << "(IOBase::readItem): unknown ID for threshold_ai "
<< tai << endl;
return false;
}
......@@ -548,7 +548,7 @@ bool IOBase::initItem( IOBase* b, UniXML_iterator& it, SMInterface* shm,
}
// else
// {
// dlog[Debug::CRIT] << myname << "(IOBase::readItem): неизвестный iotype=: " << stype << " для " << sname << endl;
// dlog.crit() << myname << "(IOBase::readItem): неизвестный iotype=: " << stype << " для " << sname << endl;
// return false;
// }
......
extensions/lib/SMInterface.cc
View file @ dc1fabfe
......@@ -51,24 +51,24 @@ using namespace UniSetTypes;
} \
catch( IOController_i::NameNotFound &ex ) \
{ \
unideb[Debug::WARN] << "(" << __STRING(fname) << "): " << ex.err << endl; \
ulog.warn() << "(" << __STRING(fname) << "): " << ex.err << endl; \
} \
catch( IOController_i::IOBadParam &ex ) \
{ \
unideb[Debug::WARN] << "(" << __STRING(fname) << "): " << ex.err << endl; \
ulog.warn() << "(" << __STRING(fname) << "): " << ex.err << endl; \
} \
catch( Exception& ex ) \
{ \
unideb[Debug::WARN] << "(" << __STRING(fname) << "): " << ex << endl; \
ulog.warn() << "(" << __STRING(fname) << "): " << ex << endl; \
} \
catch(CORBA::SystemException& ex) \
{ \
unideb[Debug::WARN] << "(" << __STRING(fname) << "): CORBA::SystemException: " \
ulog.warn() << "(" << __STRING(fname) << "): CORBA::SystemException: " \
<< ex.NP_minorString() << endl; \
} \
catch(...) \
{ \
unideb[Debug::WARN] << "(" << __STRING(fname) << "): catch ..." << endl; \
ulog.warn() << "(" << __STRING(fname) << "): catch ..." << endl; \
} \
\
oref = CORBA::Object::_nil(); \
......@@ -77,7 +77,7 @@ using namespace UniSetTypes;
#define CHECK_IC_PTR(fname) \
if( !ic ) \
{ \
unideb[Debug::WARN] << "(" << __STRING(fname) << "): function NOT DEFINED..." << endl; \
ulog.warn() << "(" << __STRING(fname) << "): function NOT DEFINED..." << endl; \
throw UniSetTypes::TimeOut(); \
} \
......
extensions/lib/UObject_SK.cc
View file @ dc1fabfe
......@@ -11,7 +11,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2013-12-15+04:00
// generate timestamp: 2013-12-17+04:00
// -----------------------------------------------------------------------------
#include "Configuration.h"
#include "Exceptions.h"
......@@ -43,7 +43,7 @@ askPause(2000),
end_private(false)
{
unideb[Debug::CRIT] << "UObject: init failed!!!!!!!!!!!!!!!" << endl;
ulog.crit() << "UObject: init failed!!!!!!!!!!!!!!!" << endl;
throw Exception( string(myname+": init failed!!!") );
}
// -----------------------------------------------------------------------------
......@@ -170,23 +170,27 @@ bool UObject_SK::alarm( UniSetTypes::ObjectId _code, bool _state )
{
if( _code == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] << getName()
if( ulog.is_crit() )
ulog.crit() << getName()
<< "(alarm): попытка послать сообщение с DefaultObjectId"
<< endl;
return false;
}
unideb[Debug::LEVEL1] << getName() << "(alarm): ";
if( ulog.is_level1() )
{
ulog.level1() << getName() << "(alarm): ";
if( _state )
unideb(Debug::LEVEL1) << "SEND ";
ulog.level1(false) << "SEND ";
else
unideb(Debug::LEVEL1) << "RESET ";
unideb(Debug::LEVEL1) << endl;
ulog.level1(false) << "RESET ";
ulog.level1(false) << endl;
}
if( ulog.is_level1() )
ulog.level1() << " not found MessgeOID?!!" << endl;
unideb[Debug::LEVEL1] << " not found MessgeOID?!!" << endl;
return false;
}
// -----------------------------------------------------------------------------
......@@ -256,10 +260,11 @@ void UObject_SK::sysCommand( SystemMessage* _sm )
switch( _sm->command )
{
case SystemMessage::WatchDog:
unideb << myname << "(sysCommand): WatchDog" << endl;
ulog << myname << "(sysCommand): WatchDog" << endl;
if( !active || !ptStartUpTimeout.checkTime() )
{
unideb[Debug::WARN] << myname << "(sysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(sysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
break;
}
case SystemMessage::StartUp:
......@@ -285,12 +290,12 @@ void UObject_SK::sysCommand( SystemMessage* _sm )
case SystemMessage::LogRotate:
{
// переоткрываем логи
unideb << myname << "(sysCommand): logRotate" << endl;
string fname = unideb.getLogFile();
ulog << myname << "(sysCommand): logRotate" << endl;
string fname( ulog.getLogFile() );
if( !fname.empty() )
{
unideb.logFile(fname.c_str());
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
ulog.logFile(fname.c_str());
ulog << myname << "(sysCommand): ***************** ulog LOG ROTATE *****************" << endl;
}
}
break;
......@@ -336,9 +341,9 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
if( _testID == DefaultObjectId )
return;
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << myname << "(waitSM): waiting SM ready "
ulog.info() << myname << "(waitSM): waiting SM ready "
<< wait_msec << " msec"
<< " testID=" << _testID << endl;
}
......@@ -350,7 +355,8 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
<< "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение "
<< wait_msec << " мсек";
unideb[Debug::CRIT] << err.str() << endl;
if( ulog.is_crit() )
ulog.crit() << err.str() << endl;
terminate();
abort();
// kill(SIGTERM,getpid()); // прерываем (перезапускаем) процесс...
......@@ -404,16 +410,19 @@ void UObject_SK::callback()
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << myname << "(execute): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(execute): " << ex << endl;
}
catch(CORBA::SystemException& ex)
{
unideb[Debug::CRIT] << myname << "(execute): СORBA::SystemException: "
if( ulog.is_crit() )
ulog.crit() << myname << "(execute): СORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
unideb[Debug::CRIT] << myname << "(execute): catch ..." << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(execute): catch ..." << endl;
}
if( !active )
......@@ -450,14 +459,14 @@ long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
try
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(getValue): Обращение к неизвестному ДИСКРЕТНОМУ датчику sid="
if( ulog.is_crit() )
ulog.crit() << myname << "(getValue): Обращение к неизвестному датчику sid="
<< _sid << endl;
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(getValue): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(getValue): " << ex << endl;
throw;
}
......@@ -476,8 +485,8 @@ void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
break;
}
if( !activated )
unideb[Debug::CRIT] << myname
if( !activated && ulog.is_crit() )
ulog.crit() << myname
<< "(preAskSensors): ************* don`t activated?! ************" << endl;
for( ;; )
......@@ -489,15 +498,18 @@ void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
}
catch(SystemError& err)
{
unideb[Debug::CRIT] << myname << "(preAskSensors): " << err << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(preAskSensors): " << err << endl;
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(preAskSensors): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(preAskSensors): " << ex << endl;
}
catch(...)
{
unideb[Debug::CRIT] << myname << "(preAskSensors): catch(...)" << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(preAskSensors): catch(...)" << endl;
}
msleep(askPause);
}
......
extensions/tests/SMemoryTest/smemory-test.cc
View file @ dc1fabfe
......@@ -26,7 +26,7 @@ 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 );
ulog.logFile( logname );
dlog.logFile( logname );
SharedMemory* shm = SharedMemory::init_smemory(argc, argv);
......@@ -49,19 +49,19 @@ int main(int argc, const char **argv)
}
catch( SystemError& err )
{
unideb[Debug::CRIT] << "(smemory): " << err << endl;
ulog.crit() << "(smemory): " << err << endl;
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << "(smemory): " << ex << endl;
ulog.crit() << "(smemory): " << ex << endl;
}
catch( std::exception& e )
{
unideb[Debug::CRIT] << "(smemory): " << e.what() << endl;
ulog.crit() << "(smemory): " << e.what() << endl;
}
catch(...)
{
unideb[Debug::CRIT] << "(smemory): catch(...)" << endl;
ulog.crit() << "(smemory): catch(...)" << endl;
}
return 1;
......
include/Configuration.h
View file @ dc1fabfe
......@@ -240,7 +240,7 @@ namespace UniSetTypes
extern Configuration* conf;
/*! Глобальный объект для вывода логов */
extern DebugStream unideb;
extern DebugStream ulog;
// Инициализация UniSetTypes::conf.
......
include/Debug.h
View file @ dc1fabfe
......@@ -108,6 +108,6 @@ void operator|=(Debug::type & d1, Debug::type d2)
#include "DebugStream.h"
std::ostream & operator<<(std::ostream & o, Debug::type t);
//extern DebugStream unideb;
//extern DebugStream ulog;
#endif
include/DebugStream.h
View file @ dc1fabfe
......@@ -58,7 +58,7 @@ struct Debug {
If you want to have debug output from time critical code you should
use this construct:
if (debug.debugging(Debug::INFO)) {
if (debug..is_info()) {
debug << "...debug output...\n";
}
......@@ -117,12 +117,8 @@ public:
inline std::string getLogFile(){ return fname; }
/// Returns true if t is part of the current debug level.
bool debugging(Debug::type t = Debug::ANY) const
{
if (dt & t) return true;
return false;
}
inline bool debugging(Debug::type t = Debug::ANY) const
{ return (dt & t); }
/** Returns the no-op stream if t is not part of the
current debug level otherwise the real debug stream
......@@ -146,26 +142,52 @@ public:
Вывод продолжения логов (без даты и времени)
*/
inline std::ostream& to_end(Debug::type t)
{
return this->operator()(t);
}
{ return this->operator()(t); }
/**
Вывод продолжения логов (без даты и времени)
Вывод продолжения логов (без даты и времени) "log()"
*/
std::ostream& operator()(Debug::type t);
inline void showDateTime(bool s)
{
show_datetime = s;
}
std::ostream& print_date(Debug::type t, char brk='/');
std::ostream& print_time(Debug::type t, char brk=':');
std::ostream& print_datetime(Debug::type t);
{ show_datetime = s; }
// короткие функции (для удобства)
// log.level1() - вывод с датой и временем "date time [LEVEL] ...",
// если вывод даты и времени не выключен при помощи showDateTime(false)
// if( log.is_level1() ) - проверка включён ли лог.."
#define DMANIP(FNAME,LEVEL) \
inline std::ostream& FNAME( bool showdatetime=true ) \
{\
if( showdatetime )\
return operator[](Debug::LEVEL); \
return operator()(Debug::LEVEL); \
} \
\
inline bool is_##FNAME() \
{ return debugging(Debug::LEVEL); }
DMANIP(level1,LEVEL1)
DMANIP(level2,LEVEL2)
DMANIP(level3,LEVEL3)
DMANIP(level4,LEVEL4)
DMANIP(level5,LEVEL5)
DMANIP(level6,LEVEL6)
DMANIP(level7,LEVEL7)
DMANIP(level8,LEVEL8)
DMANIP(level9,LEVEL9)
DMANIP(info,INFO)
DMANIP(warn,WARN)
DMANIP(crit,CRIT)
DMANIP(repository,REPOSITORY)
DMANIP(system,SYSTEM)
DMANIP(exception,EXCEPTION)
#undef DMANIP
std::ostream& printDate(Debug::type t, char brk='/');
std::ostream& printTime(Debug::type t, char brk=':');
std::ostream& printDateTime(Debug::type t);
std::ostream& pos(int x, int y);
......
include/UniXML.h
View file @ dc1fabfe
......@@ -105,7 +105,7 @@ class UniXML_iterator:
operator xmlNode*()
{
//unideb << "current\n";
//ulog.< "current\n";
return curNode;
}
......
python/lib/pyUniSet/UModbus.cc
View file @ dc1fabfe
......@@ -237,7 +237,7 @@ long UModbus::data2value( VTypes::VType vtype, ModbusRTU::ModbusData* data )
return true;
}
dlog[Debug::CRIT] << myname << "(initSMValue): IGNORE item: rnum=" << p->rnum
dlog.crit() << myname << "(initSMValue): IGNORE item: rnum=" << p->rnum
<< " > 1 ?!! for id=" << p->si.id << endl;
return false;
......
src/Communications/Modbus/ModbusClient.cc
View file @ dc1fabfe
......@@ -212,8 +212,8 @@ void ModbusClient::fileTransfer( ModbusAddr addr, ModbusData numfile,
FILE* fdsave = fopen(save2filename,"w");
if( fdsave == NULL )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(fileTransfer): fopen '"
if( dlog.is_warn() )
dlog.warn() << "(fileTransfer): fopen '"
<< save2filename << "' with error: "
<< strerror(errno) << endl;
throw mbException(erHardwareError);
......@@ -231,30 +231,31 @@ void ModbusClient::fileTransfer( ModbusAddr addr, ModbusData numfile,
FileTransferRetMessage ret = partOfFileTransfer( addr, numfile, curpack, part_timeout_msec );
if( ret.numfile != numfile )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(fileTransfer): recv nfile=" << ret.numfile
if( dlog.is_warn() )
dlog.warn() << "(fileTransfer): recv nfile=" << ret.numfile
<< " !=numfile(" << numfile << ")" << endl;
continue;
}
if( ret.packet != curpack )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(fileTransfer): recv npack=" << ret.packet
if( dlog.is_warn() )
dlog.warn() << "(fileTransfer): recv npack=" << ret.packet
<< " !=curpack(" << curpack << ")" << endl;
continue;
}
maxpackets = ret.numpacks;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(fileTransfer): maxpackets="
if( dlog.is_info() )
dlog.info() << "(fileTransfer): maxpackets="
<< ret.numpacks << " curpack=" << curpack+1 << endl;
// save data...
if( fwrite(&ret.data,ret.dlen,1,fdsave) <= 0 )
{
dlog[Debug::WARN] << "(fileTransfer): fwrite '"
if( dlog.is_warn() )
dlog.warn() << "(fileTransfer): fwrite '"
<< save2filename << "' with error: "
<< strerror(errno) << endl;
......@@ -341,7 +342,8 @@ mbErrCode ModbusClient::recv( ModbusAddr addr, ModbusByte qfunc,
ostringstream err;
err << "(recv): BadNodeAddress. my= " << addr2str(addr)
<< " msg.addr=" << addr2str(rbuf.addr);
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
cleanupChannel();
return erBadReplyNodeAddress;
}
......@@ -354,7 +356,8 @@ mbErrCode ModbusClient::recv( ModbusAddr addr, ModbusByte qfunc,
}
catch( Exception& ex ) // SystemError
{
dlog[Debug::CRIT] << "(recv): " << ex << endl;
if( dlog.is_crit() )
dlog.crit() << "(recv): " << ex << endl;
cleanupChannel();
return erHardwareError;
}
......@@ -375,8 +378,11 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
size_t k = getNextData((unsigned char*)(&rbuf.func),sizeof(ModbusByte));
if( k < sizeof(ModbusByte) )
{
dlog[Debug::WARN] << "(recv): " << (ModbusHeader*)(&rbuf) << endl;
dlog[Debug::WARN] << "(recv): заголовок меньше положенного..." << endl;
if( dlog.is_warn() )
{
dlog.warn() << "(recv): " << (ModbusHeader*)(&rbuf) << endl;
dlog.warn() << "(recv): заголовок меньше положенного..." << endl;
}
cleanupChannel();
return erInvalidFormat;
}
......@@ -384,8 +390,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
bcnt += k;
rbuf.len = 0;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv): header: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv): header: " << rbuf << endl;
// обработка сообщения об ошибке...
if( rbuf.func == (qfunc|MBErrMask) )
......@@ -397,10 +403,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
int rlen = getNextData((unsigned char*)(&(rbuf.data)),rbuf.len);
if( rlen < rbuf.len )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(recv:Error): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(recv:Error)(" << rbuf.func
dlog.warn() << "(recv:Error): buf: " << rbuf << endl;
dlog.warn() << "(recv:Error)(" << rbuf.func
<< "): Получили данных меньше чем ждали...(recv="
<< rlen << " < wait=" << rbuf.len << ")" << endl;
}
......@@ -419,7 +425,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(recv:error): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(em.crc);
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
}
......@@ -517,10 +524,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen < rbuf.len )
{
// rbuf.len = bcnt + rlen - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(recv): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(recv)(" << rbuf.func
dlog.warn() << "(recv): buf: " << rbuf << endl;
dlog.warn() << "(recv)(" << rbuf.func
<< "): Получили данных меньше чем ждали...(recv="
<< rlen << " < wait=" << rbuf.len << ")" << endl;
}
......@@ -546,10 +553,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x01): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x01)("
dlog.warn() << "(0x01): buf: " << rbuf << endl;
dlog.warn() << "(0x01)("
<< (int)rbuf.func << "):(fnReadCoilStatus) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -564,8 +571,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ReadCoilRetMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x01)(fnReadCoilStatus): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x01)(fnReadCoilStatus): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -580,8 +587,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x01)(fnReadCoilStatus): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -601,10 +608,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x02): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x02)("
dlog.warn() << "(0x02): buf: " << rbuf << endl;
dlog.warn() << "(0x02)("
<< (int)rbuf.func << "):(fnReadInputStatus) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -619,8 +626,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ReadInputStatusRetMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x02)(fnReadInputStatus): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x02)(fnReadInputStatus): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -635,8 +642,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(recv:fnReadInputStatus): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -656,10 +663,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x04): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x04)("
dlog.warn() << "(0x04): buf: " << rbuf << endl;
dlog.warn() << "(0x04)("
<< (int)rbuf.func << "):(fnReadInputRegisters) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -674,8 +681,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ReadInputRetMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv)(fnReadInputRegisters): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv)(fnReadInputRegisters): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -690,8 +697,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(recv:fnReadInputRegisters): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -710,10 +717,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x03): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x03)("
dlog.warn() << "(0x03): buf: " << rbuf << endl;
dlog.warn() << "(0x03)("
<< (int)rbuf.func << "):(fnReadInputRegisters) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -728,8 +735,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ReadOutputRetMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv)(fnReadOutputRegisters): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv)(fnReadOutputRegisters): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -744,8 +751,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(recv:fnReadOutputRegisters): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -756,8 +763,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
rbuf.len = bcnt - szModbusHeader;
ForceCoilsRetMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x0F): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x0F): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -772,7 +779,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x0F): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
return erNoError;
......@@ -782,8 +789,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
rbuf.len = bcnt - szModbusHeader;
WriteOutputRetMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x10): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x10): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -798,7 +805,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x10): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -808,8 +815,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
{
WriteSingleOutputRetMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x06): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x06): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -824,7 +831,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x06): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -834,8 +841,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
{
ForceSingleCoilRetMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x05): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x05): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -850,7 +857,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x05): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
return erNoError;
......@@ -869,10 +876,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x08): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x08)("
dlog.warn() << "(0x08): buf: " << rbuf << endl;
dlog.warn() << "(0x08)("
<< (int)rbuf.func << "):(fnDiagnostics) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -887,8 +894,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
DiagnosticRetMessage mDiag(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv)(fnDiagnostics): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv)(fnDiagnostics): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -903,8 +910,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(recv:fnDiagnostics): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mDiag.crc);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -926,10 +933,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x2B/0x0E)("
dlog.warn() << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog.warn() << "(0x2B/0x0E)("
<< (int)rbuf.func << "):(fnMEI) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -948,10 +955,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x2B/0x0E)("
dlog.warn() << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog.warn() << "(0x2B/0x0E)("
<< (int)rbuf.func << "):(fnMEI) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -971,8 +978,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( crcNoCheckit )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv)(fnMEI): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv)(fnMEI): recv buf: " << rbuf << endl;
return erNoError;
}
......@@ -981,10 +988,10 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szCRC )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x2B/0x0E)("
dlog.warn() << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog.warn() << "(0x2B/0x0E)("
<< (int)rbuf.func << "):(fnMEI) "
<< "(CRC): Получили данных меньше чем ждали...("
<< rlen1 << " < " << szCRC << ")" << endl;
......@@ -997,8 +1004,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
bcnt += rlen1;
rbuf.len = bcnt - szModbusHeader;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv)(fnMEI): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv)(fnMEI): recv buf: " << rbuf << endl;
MEIMessageRetRDI mRDI(rbuf);
......@@ -1012,8 +1019,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(recv:fnMEI): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRDI.crc);
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << err.str() << endl;
if( dlog.is_warn() )
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -1022,8 +1029,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
else if( rbuf.func == fnSetDateTime )
{
SetDateTimeRetMessage mSet(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x50): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x50): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -1035,14 +1042,14 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x50): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mSet.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
}
if( !mSet.checkFormat() )
{
dlog[Debug::WARN] << "(0x50): некорректные значения..." << endl;
dlog.warn() << "(0x50): некорректные значения..." << endl;
return erBadDataValue; // return erInvalidFormat;
}
......@@ -1061,8 +1068,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x66): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x66)("
dlog.warn() << "(0x66): buf: " << rbuf << endl;
dlog.warn() << "(0x66)("
<< rbuf.func << "):(fnFileTransfer) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -1075,8 +1082,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
rbuf.len = bcnt - szModbusHeader;
FileTransferRetMessage mFT(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x66): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x66): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1091,7 +1098,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x66): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mFT.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -1101,8 +1108,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
else if( rbuf.func == fnJournalCommand )
{
JournalCommandMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x65): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x65): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1116,7 +1123,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x65): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -1136,8 +1143,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
if( rlen1 < szDataLen )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x53): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x53)("
dlog.warn() << "(0x53): buf: " << rbuf << endl;
dlog.warn() << "(0x53)("
<< rbuf.func << "):(fnWriteOutputRegisters) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -1151,8 +1158,8 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
RemoteServiceMessage mRServ(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x53): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x53): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1167,7 +1174,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
ostringstream err;
err << "(0x53): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRServ.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
return erBadCheckSum;
}
......@@ -1185,7 +1192,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
catch( mbException& ex )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(recv): " << ex << endl;
dlog.crit() << "(recv): " << ex << endl;
return ex.err;
}
catch( UniSetTypes::TimeOut )
......@@ -1195,7 +1202,7 @@ mbErrCode ModbusClient::recv_pdu( ModbusByte qfunc, ModbusMessage& rbuf, timeout
catch( Exception& ex ) // SystemError
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(recv): " << ex << endl;
dlog.crit() << "(recv): " << ex << endl;
return erHardwareError;
}
......@@ -1207,7 +1214,7 @@ mbErrCode ModbusClient::send( ModbusMessage& msg )
{
if( msg.len > MAXLENPACKET + szModbusHeader )
{
dlog[Debug::WARN] << "(send): длина пакета больше разрешённой..." << endl;
dlog.warn() << "(send): длина пакета больше разрешённой..." << endl;
return erPacketTooLong;
}
......@@ -1215,8 +1222,8 @@ mbErrCode ModbusClient::send( ModbusMessage& msg )
if( crcNoCheckit )
len -= szCRC;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(send)(" << len << " bytes): " << msg << endl;
if( dlog.is_info() )
dlog.info() << "(send)(" << len << " bytes): " << msg << endl;
try
{
......@@ -1224,12 +1231,12 @@ mbErrCode ModbusClient::send( ModbusMessage& msg )
}
catch( mbException& ex )
{
dlog[Debug::CRIT] << "(send): " << ex << endl;
dlog.crit() << "(send): " << ex << endl;
return ex.err;
}
catch( Exception& ex ) // SystemError
{
dlog[Debug::CRIT] << "(send): " << ex << endl;
dlog.crit() << "(send): " << ex << endl;
return erHardwareError;
}
......@@ -1259,9 +1266,9 @@ void ModbusClient::setLog( DebugStream& l )
// -------------------------------------------------------------------------
void ModbusClient::printProcessingTime()
{
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << "(processingTime): "
dlog.info() << "(processingTime): "
<< tmProcessing.getCurrent() << " [мсек]" << endl;
}
}
......
src/Communications/Modbus/ModbusRTUMaster.cc
View file @ dc1fabfe
......@@ -127,7 +127,7 @@ mbErrCode ModbusRTUMaster::sendData( unsigned char* buf, int len )
}
catch( Exception& ex ) // SystemError
{
dlog[Debug::CRIT] << "(send): " << ex << endl;
dlog.crit() << "(send): " << ex << endl;
return erHardwareError;
}
......
src/Communications/Modbus/ModbusRTUSlave.cc
View file @ dc1fabfe
......@@ -68,7 +68,7 @@ mbErrCode ModbusRTUSlave::receive( ModbusRTU::ModbusAddr addr, timeout_t timeout
if( !lck.lock_ok() )
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(ModbusRTUSlave::receive): Don`t lock " << recvMutex << endl;
dlog.crit() << "(ModbusRTUSlave::receive): Don`t lock " << recvMutex << endl;
return erTimeOut;
}
......@@ -89,7 +89,7 @@ mbErrCode ModbusRTUSlave::receive( ModbusRTU::ModbusAddr addr, timeout_t timeout
printProcessingTime();
}
// dlog[Debug::WARN] << "(receive): " << mbErr2Str(res) << endl;
// dlog.warn() << "(receive): " << mbErr2Str(res) << endl;
// cerr << "**** (receive): " << mbErr2Str(res) << endl;
usleep(10000);
return res;
......@@ -151,7 +151,7 @@ mbErrCode ModbusRTUSlave::sendData( unsigned char* buf, int len )
}
catch( Exception& ex ) // SystemError
{
dlog[Debug::CRIT] << "(send): " << ex << endl;
dlog.crit() << "(send): " << ex << endl;
return erHardwareError;
}
......
src/Communications/Modbus/ModbusServer.cc
View file @ dc1fabfe
......@@ -75,7 +75,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x01): err reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x01): err reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -107,7 +107,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x02): err reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x02): err reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -139,7 +139,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x03): err reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x03): err reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -171,7 +171,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x04): err reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x04): err reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -204,7 +204,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x0F): err reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x0F): err reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -237,7 +237,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x10): err reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x10): err reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -268,7 +268,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x08): reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x08): reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -299,7 +299,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x2B/0x0E): reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x2B/0x0E): reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -331,7 +331,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x05): reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x05): reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -364,7 +364,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x06): reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x06): reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -396,7 +396,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x65): reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x65): reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -427,7 +427,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x50): reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x50): reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -458,7 +458,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x53): error reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x53): error reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -489,7 +489,7 @@ mbErrCode ModbusServer::processing( ModbusMessage& buf )
// в случае ошибок ответа не посылаем
if( res != erNoError )
{
dlog[Debug::WARN] << "(0x66): error reply: " << mbErr2Str(res) << endl;
dlog.warn() << "(0x66): error reply: " << mbErr2Str(res) << endl;
// Если ошибка подразумевает посылку ответа с сообщением об ошибке
// то посылаем
......@@ -557,12 +557,12 @@ mbErrCode ModbusServer::recv( ModbusRTU::ModbusAddr addr, ModbusMessage& rbuf, t
// Проверка кому адресован пакет...
if( rbuf.addr!=addr && rbuf.addr!=BroadcastAddr )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(recv): BadNodeAddress. my= " << addr2str(addr)
<< " msg.addr=" << addr2str(rbuf.addr);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
......@@ -577,7 +577,7 @@ mbErrCode ModbusServer::recv( ModbusRTU::ModbusAddr addr, ModbusMessage& rbuf, t
}
catch( Exception& ex ) // SystemError
{
dlog[Debug::CRIT] << "(recv): " << ex << endl;
dlog.crit() << "(recv): " << ex << endl;
cleanupChannel();
return erHardwareError;
}
......@@ -597,8 +597,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
size_t k = getNextData((unsigned char*)(&rbuf.func),sizeof(ModbusByte));
if( k < sizeof(ModbusByte) )
{
dlog[Debug::WARN] << "(recv): " << (ModbusHeader*)(&rbuf) << endl;
dlog[Debug::WARN] << "(recv): заголовок меньше положенного..." << endl;
dlog.warn() << "(recv): " << (ModbusHeader*)(&rbuf) << endl;
dlog.warn() << "(recv): заголовок меньше положенного..." << endl;
cleanupChannel();
return erInvalidFormat;
}
......@@ -606,8 +606,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
bcnt += k;
rbuf.len = 0;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(recv): header: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(recv): header: " << rbuf << endl;
// Определяем тип сообщения
switch( rbuf.func )
......@@ -694,11 +694,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen = getNextData((unsigned char*)(rbuf.data),rbuf.len);
if( rlen < rbuf.len )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
// rbuf.len = bcnt + rlen - szModbusHeader;
dlog[Debug::WARN] << "(recv): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(recv)(" << rbuf.func
dlog.warn() << "(recv): buf: " << rbuf << endl;
dlog.warn() << "(recv)(" << rbuf.func
<< "): Получили данных меньше чем ждали...(recv="
<< rlen << " < wait=" << (int)rbuf.len << ")" << endl;
}
......@@ -712,8 +712,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
if( rbuf.func == fnReadCoilStatus )
{
ReadCoilMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x01): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x01): recv buf: " << rbuf << endl;
// Проверяем контрольную сумму
// от начала(включая заголовок) и до конца (исключив последний элемент содержащий CRC)
......@@ -723,12 +723,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRead.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x01): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -739,8 +739,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
else if( rbuf.func == fnReadInputStatus )
{
ReadInputStatusMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(r0x02): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(r0x02): recv buf: " << rbuf << endl;
// Проверяем контрольную сумму
// от начала(включая заголовок) и до конца (исключив последний элемент содержащий CRC)
......@@ -750,12 +750,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRead.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x02): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -766,8 +766,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
else if( rbuf.func == fnReadOutputRegisters )
{
ReadOutputMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x03): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x03): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -777,12 +777,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRead.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x03): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -793,8 +793,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
else if( rbuf.func == fnReadInputRegisters )
{
ReadInputMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x04): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x04): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -804,12 +804,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRead.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x04): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -829,11 +829,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szDataLen);
if( rlen1 < szDataLen )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x0F): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x0F)("
dlog.warn() << "(0x0F): buf: " << rbuf << endl;
dlog.warn() << "(0x0F)("
<< rbuf.func << "):(fnForceMultipleCoils) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -847,8 +847,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ForceCoilsMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x0F): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x0F): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -862,7 +862,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ostringstream err;
err << "(0x0F): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
cleanupChannel();
return erBadCheckSum;
}
......@@ -870,9 +870,9 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
if( !mWrite.checkFormat() )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
dlog[Debug::WARN] << "(0x0F): (" << rbuf.func
dlog.warn() << "(0x0F): (" << rbuf.func
<< ")(fnForceMultipleCoils): "
<< ": некорректный формат сообщения..." << endl;
}
......@@ -895,11 +895,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szDataLen);
if( rlen1 < szDataLen )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x10): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x10)("
dlog.warn() << "(0x10): buf: " << rbuf << endl;
dlog.warn() << "(0x10)("
<< rbuf.func << "):(fnWriteOutputRegisters) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -913,8 +913,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
WriteOutputMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x10): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x10): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -925,12 +925,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mWrite.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x10): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -939,7 +939,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
if( !mWrite.checkFormat() )
{
dlog[Debug::WARN] << "(0x10): (" << rbuf.func
dlog.warn() << "(0x10): (" << rbuf.func
<< ")(fnWriteOutputRegisters): "
<< ": некорректный формат сообщения..." << endl;
cleanupChannel();
......@@ -961,11 +961,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szDataLen);
if( rlen1 < szDataLen )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x05): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x05)("
dlog.warn() << "(0x05): buf: " << rbuf << endl;
dlog.warn() << "(0x05)("
<< rbuf.func << "):(fnForceSingleCoil) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -979,8 +979,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ForceSingleCoilMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x05): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x05): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -991,12 +991,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mWrite.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x05): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1005,7 +1005,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
if( !mWrite.checkFormat() )
{
dlog[Debug::WARN] << "(0x05): (" << rbuf.func
dlog.warn() << "(0x05): (" << rbuf.func
<< ")(fnForceSingleCoil): "
<< ": некорректный формат сообщения..." << endl;
cleanupChannel();
......@@ -1027,11 +1027,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szDataLen);
if( rlen1 < szDataLen )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x06): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x06)("
dlog.warn() << "(0x06): buf: " << rbuf << endl;
dlog.warn() << "(0x06)("
<< rbuf.func << "):(fnWriteOutputSingleRegisters) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -1045,8 +1045,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
WriteSingleOutputMessage mWrite(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x06): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x06): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -1057,12 +1057,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mWrite.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x06): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mWrite.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1071,7 +1071,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
if( !mWrite.checkFormat() )
{
dlog[Debug::WARN] << "(0x06): (" << rbuf.func
dlog.warn() << "(0x06): (" << rbuf.func
<< ")(fnWriteOutputSingleRegisters): "
<< ": некорректный формат сообщения..." << endl;
cleanupChannel();
......@@ -1093,11 +1093,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szDataLen);
if( rlen1 < szDataLen )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x08): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x08)("
dlog.warn() << "(0x08): buf: " << rbuf << endl;
dlog.warn() << "(0x08)("
<< rbuf.func << "):(fnDiagnostics) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -1111,8 +1111,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
DiagnosticMessage mDiag(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x08): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x08): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -1123,12 +1123,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mDiag.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x08): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mDiag.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1137,7 +1137,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
/*
if( !mDiag.checkFormat() )
{
dlog[Debug::WARN] << "(0x08): (" << rbuf.func
dlog.warn() << "(0x08): (" << rbuf.func
<< ")(fnDiagnostics): "
<< ": некорректный формат сообщения..." << endl;
cleanupChannel();
......@@ -1153,11 +1153,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szCRC);
if( rlen1 < szCRC )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x2B/0x0E)("
dlog.warn() << "(0x2B/0x0E): buf: " << rbuf << endl;
dlog.warn() << "(0x2B/0x0E)("
<< rbuf.func << "):(fnMEI) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szCRC << ")" << endl;
......@@ -1172,8 +1172,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
MEIMessageRDI mRDI(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x2B/0x0E): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x2B/0x0E): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1185,12 +1185,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRDI.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x2B/0x0E): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRDI.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1201,8 +1201,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
else if( rbuf.func == fnJournalCommand )
{
JournalCommandMessage mRead(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x65): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x65): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1213,12 +1213,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRead.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x65): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRead.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1229,8 +1229,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
else if( rbuf.func == fnSetDateTime )
{
SetDateTimeMessage mSet(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x50): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x50): recv buf: " << rbuf << endl;
if( !crcNoCheckit )
{
......@@ -1240,12 +1240,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mSet.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x50): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mSet.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1254,7 +1254,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
if( !mSet.checkFormat() )
{
dlog[Debug::WARN] << "(0x50): некорректные значения..." << endl;
dlog.warn() << "(0x50): некорректные значения..." << endl;
cleanupChannel();
return erBadDataValue; // return erInvalidFormat;
}
......@@ -1274,11 +1274,11 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
int rlen1 = getNextData((unsigned char*)(&(rbuf.data[rlen])),szDataLen);
if( rlen1 < szDataLen )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
rbuf.len = bcnt + rlen1 - szModbusHeader;
dlog[Debug::WARN] << "(0x53): buf: " << rbuf << endl;
dlog[Debug::WARN] << "(0x53)("
dlog.warn() << "(0x53): buf: " << rbuf << endl;
dlog.warn() << "(0x53)("
<< rbuf.func << "):(fnWriteOutputRegisters) "
<< "Получили данных меньше чем ждали...("
<< rlen1 << " < " << szDataLen << ")" << endl;
......@@ -1292,8 +1292,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
RemoteServiceMessage mRServ(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x53): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x53): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1305,12 +1305,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mRServ.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x53): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mRServ.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1321,8 +1321,8 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
else if( rbuf.func == fnFileTransfer )
{
FileTransferMessage mFT(rbuf);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(0x66): recv buf: " << rbuf << endl;
if( dlog.is_info() )
dlog.info() << "(0x66): recv buf: " << rbuf << endl;
if( crcNoCheckit )
return erNoError;
......@@ -1334,12 +1334,12 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
ModbusData tcrc = checkCRC((ModbusByte*)(&rbuf),bcnt-szCRC);
if( tcrc != mFT.crc )
{
if( dlog.debugging(Debug::WARN) )
if( dlog.is_warn() )
{
ostringstream err;
err << "(0x66): bad crc. calc.crc=" << dat2str(tcrc)
<< " msg.crc=" << dat2str(mFT.crc);
dlog[Debug::WARN] << err.str() << endl;
dlog.warn() << err.str() << endl;
}
cleanupChannel();
return erBadCheckSum;
......@@ -1356,7 +1356,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
catch( ModbusRTU::mbException& ex ) // SystemError
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(recv): mbException: " << ex << endl;
dlog.crit() << "(recv): mbException: " << ex << endl;
cleanupChannel();
return ex.err;
}
......@@ -1367,7 +1367,7 @@ mbErrCode ModbusServer::recv_pdu( ModbusMessage& rbuf, timeout_t timeout )
catch( UniSetTypes::Exception& ex ) // SystemError
{
if( dlog.debugging(Debug::CRIT) )
dlog[Debug::CRIT] << "(recv): " << ex << endl;
dlog.crit() << "(recv): " << ex << endl;
cleanupChannel();
return erHardwareError;
}
......@@ -1392,8 +1392,8 @@ void ModbusServer::initLog( UniSetTypes::Configuration* conf,
// -------------------------------------------------------------------------
void ModbusServer::printProcessingTime()
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(processingTime): " << tmProcessing.getCurrent() << " [msec] (lim: " << tmProcessing.getInterval() << ")" << endl;
if( dlog.is_info() )
dlog.info() << "(processingTime): " << tmProcessing.getCurrent() << " [msec] (lim: " << tmProcessing.getInterval() << ")" << endl;
}
// -------------------------------------------------------------------------
ModbusRTU::mbErrCode ModbusServer::replyFileTransfer( const std::string fname,
......@@ -1401,13 +1401,13 @@ ModbusRTU::mbErrCode ModbusServer::replyFileTransfer( const std::string fname,
ModbusRTU::FileTransferRetMessage& reply,
DebugStream* dlog )
{
if( dlog && dlog->debugging(Debug::INFO) )
if( dlog && dlog->is_info() )
(*dlog)[Debug::INFO] << "(replyFileTransfer): " << query << endl;
int fd = open(fname.c_str(), O_RDONLY | O_NONBLOCK );
if( fd <= 0 )
{
if( dlog && dlog->debugging(Debug::WARN) )
if( dlog && dlog->is_warn() )
(*dlog)[Debug::WARN] << "(replyFileTransfer): open '" << fname << "' with error: " << strerror(errno) << endl;
return ModbusRTU::erOperationFailed;
}
......@@ -1420,7 +1420,7 @@ ModbusRTU::mbErrCode ModbusServer::replyFileTransfer( const std::string fname,
int ret = ::read(fd,&buf,sizeof(buf));
if( ret < 0 )
{
if( dlog && dlog->debugging(Debug::WARN) )
if( dlog && dlog->is_warn() )
(*dlog)[Debug::WARN] << "(replyFileTransfer): read from '" << fname << "' with error: " << strerror(errno) << endl;
close(fd);
return ModbusRTU::erOperationFailed;
......@@ -1429,7 +1429,7 @@ ModbusRTU::mbErrCode ModbusServer::replyFileTransfer( const std::string fname,
struct stat fs;
if( fstat(fd,&fs) < 0 )
{
if( dlog && dlog->debugging(Debug::WARN) )
if( dlog && dlog->is_warn() )
(*dlog)[Debug::WARN] << "(replyFileTransfer): fstat for '" << fname << "' with error: " << strerror(errno) << endl;
close(fd);
return ModbusRTU::erOperationFailed;
......@@ -1442,7 +1442,7 @@ ModbusRTU::mbErrCode ModbusServer::replyFileTransfer( const std::string fname,
if( !reply.set(query.numfile,numpacks,query.numpacket,buf,ret) )
{
if( dlog && dlog->debugging(Debug::WARN) )
if( dlog && dlog->is_warn() )
(*dlog)[Debug::WARN] << "(replyFileTransfer): set date failed..." << endl;
return ModbusRTU::erOperationFailed;
}
......@@ -1454,7 +1454,7 @@ ModbusRTU::mbErrCode ModbusServer::replySetDateTime( ModbusRTU::SetDateTimeMessa
ModbusRTU::SetDateTimeRetMessage& reply,
DebugStream* dlog )
{
if( dlog && dlog->debugging(Debug::INFO) )
if( dlog && dlog->is_info() )
(*dlog)[Debug::INFO] << "(replySetDateTime): " << query << endl;
struct timeval set;
......@@ -1480,10 +1480,10 @@ ModbusRTU::mbErrCode ModbusServer::replySetDateTime( ModbusRTU::SetDateTimeMessa
ModbusRTU::SetDateTimeRetMessage::cpy(reply,query);
return ModbusRTU::erNoError;
}
else if( dlog && dlog->debugging(Debug::WARN) )
else if( dlog && dlog->is_warn() )
(*dlog)[Debug::WARN] << "(replySetDateTime): settimeofday err: " << strerror(errno) << endl;
}
else if( dlog && dlog->debugging(Debug::WARN) )
else if( dlog && dlog->is_warn() )
(*dlog)[Debug::WARN] << "(replySetDateTime): gettimeofday err: " << strerror(errno) << endl;
return ModbusRTU::erOperationFailed;
......@@ -1501,13 +1501,13 @@ mbErrCode ModbusServer::send( ModbusMessage& msg )
if( msg.len > MAXLENPACKET + szModbusHeader )
{
dlog[Debug::WARN] << "(send): длина пакета больше разрешённой..." << endl;
dlog.warn() << "(send): длина пакета больше разрешённой..." << endl;
return erPacketTooLong;
}
if( tmProcessing.checkTime() )
{
dlog[Debug::WARN] << "(send): reply timeout(" << tmProcessing.getInterval() << ")...!!!" << endl;
dlog.warn() << "(send): reply timeout(" << tmProcessing.getInterval() << ")...!!!" << endl;
return erTimeOut;
}
......@@ -1519,8 +1519,8 @@ mbErrCode ModbusServer::send( ModbusMessage& msg )
}
// printf("send to %02x type=%d size=%d\n",m.dest,(m.type&TypeMask),slen);
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(send): data(" << len << " bytes): " << msg << endl;
if( dlog.is_info() )
dlog.info() << "(send): data(" << len << " bytes): " << msg << endl;
try
{
......@@ -1528,7 +1528,7 @@ mbErrCode ModbusServer::send( ModbusMessage& msg )
}
catch( Exception& ex ) // SystemError
{
dlog[Debug::CRIT] << "(send): " << ex << endl;
dlog.crit() << "(send): " << ex << endl;
return erHardwareError;
}
......
src/Communications/Modbus/ModbusTCPMaster.cc
View file @ dc1fabfe
......@@ -54,22 +54,22 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
{
if( iaddr.empty() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << iaddr << "(ModbusTCPMaster::query): unknown ip address for server..." << endl;
if( dlog.is_warn() )
dlog.warn() << iaddr << "(ModbusTCPMaster::query): unknown ip address for server..." << endl;
return erTimeOut; // erHardwareError
}
if( !isConnection() )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << iaddr << "(ModbusTCPMaster::query): no connection.. reconnnect..." << endl;
if( dlog.is_info() )
dlog.info() << iaddr << "(ModbusTCPMaster::query): no connection.. reconnnect..." << endl;
reconnect();
}
if( !isConnection() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << iaddr << "(ModbusTCPMaster::query): not connected to server..." << endl;
if( dlog.is_warn() )
dlog.warn() << iaddr << "(ModbusTCPMaster::query): not connected to server..." << endl;
return erTimeOut;
}
......@@ -95,9 +95,9 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
mh.swapdata();
// send TCP header
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << iaddr << "(ModbusTCPMaster::query): send tcp header(" << sizeof(mh) <<"): ";
dlog.info() << iaddr << "(ModbusTCPMaster::query): send tcp header(" << sizeof(mh) <<"): ";
mbPrintMessage( dlog, (ModbusByte*)(&mh), sizeof(mh));
dlog(Debug::INFO) << endl;
}
......@@ -114,20 +114,20 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
if( tcp->isPending(ost::Socket::pendingOutput,timeout) )
break;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPMaster::query): no write pending.. reconnnect.." << endl;
if( dlog.is_info() )
dlog.info() << "(ModbusTCPMaster::query): no write pending.. reconnnect.." << endl;
reconnect();
if( !isConnection() )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(ModbusTCPMaster::query): not connected to server..." << endl;
if( dlog.is_warn() )
dlog.warn() << "(ModbusTCPMaster::query): not connected to server..." << endl;
return erTimeOut;
}
cleanInputStream();
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPMaster::query): no write pending.. reconnnect OK" << endl;
if( dlog.is_info() )
dlog.info() << "(ModbusTCPMaster::query): no write pending.. reconnnect OK" << endl;
}
mh.swapdata();
......@@ -160,18 +160,18 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
*/
ModbusTCP::MBAPHeader rmh;
int ret = getNextData((unsigned char*)(&rmh),sizeof(rmh));
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << "(ModbusTCPMaster::query): recv tcp header(" << ret << "): ";
dlog.info() << "(ModbusTCPMaster::query): recv tcp header(" << ret << "): ";
mbPrintMessage( dlog, (ModbusByte*)(&rmh), sizeof(rmh));
dlog(Debug::INFO) << endl;
dlog.info(false) << endl;
}
if( ret < (int)sizeof(rmh) )
{
ost::tpport_t port;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPMaster::query): ret=" << (int)ret
if( dlog.is_info() )
dlog.info() << "(ModbusTCPMaster::query): ret=" << (int)ret
<< " < rmh=" << (int)sizeof(rmh)
<< " err: " << tcp->getErrorNumber()
<< " perr: " << tcp->getPeer(&port)
......@@ -201,8 +201,8 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
if( force_disconnect )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(query): force disconnect.." << endl;
if( dlog.is_info() )
dlog.info() << "(query): force disconnect.." << endl;
disconnect();
}
......@@ -210,13 +210,13 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
return res;
}
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(query): input pending timeout " << endl;
if( dlog.is_info() )
dlog.info() << "(query): input pending timeout " << endl;
if( force_disconnect )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(query): force disconnect.." << endl;
if( dlog.is_info() )
dlog.info() << "(query): force disconnect.." << endl;
// cleanInputStream();
disconnect();
......@@ -226,35 +226,35 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
}
catch( ModbusRTU::mbException& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(query): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << "(query): " << ex << endl;
}
catch( SystemError& err )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(query): " << err << endl;
if( dlog.is_warn() )
dlog.warn() << "(query): " << err << endl;
}
catch( Exception& ex )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(query): " << ex << endl;
if( dlog.is_warn() )
dlog.warn() << "(query): " << ex << endl;
}
catch( ost::SockException& e )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(query): tcp error: " << e.getString() << endl;
if( dlog.is_warn() )
dlog.warn() << "(query): tcp error: " << e.getString() << endl;
return erTimeOut;
}
catch( std::exception& e )
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::CRIT] << "(query): " << e.what() << std::endl;
if( dlog.is_warn() )
dlog.crit() << "(query): " << e.what() << std::endl;
return erTimeOut;
}
catch(...)
{
if( dlog.debugging(Debug::WARN) )
dlog[Debug::WARN] << "(query): cath..." << endl;
if( dlog.is_warn() )
dlog.warn() << "(query): cath..." << endl;
}
return erTimeOut; // erHardwareError
......@@ -295,8 +295,8 @@ bool ModbusTCPMaster::checkConnection( const std::string ip, int port, int timeo
// -------------------------------------------------------------------------
void ModbusTCPMaster::reconnect()
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPMaster): reconnect " << iaddr << endl;
if( dlog.is_info() )
dlog.info() << "(ModbusTCPMaster): reconnect " << iaddr << endl;
if( tcp )
{
......@@ -320,7 +320,7 @@ void ModbusTCPMaster::reconnect()
{
ostringstream s;
s << "(ModbusTCPMaster): connection " << s.str() << " error: " << e.what();
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
}
}
catch( ... )
......@@ -329,7 +329,7 @@ void ModbusTCPMaster::reconnect()
{
ostringstream s;
s << "(ModbusTCPMaster): connection " << s.str() << " error: catch ...";
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
}
}
}
......@@ -354,8 +354,8 @@ void ModbusTCPMaster::connect( ost::InetAddress addr, int port )
ostringstream s;
s << addr << ":" << port;
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPMaster): connect to " << s.str() << endl;
if( dlog.is_info() )
dlog.info() << "(ModbusTCPMaster): connect to " << s.str() << endl;
iaddr = s.str();
......@@ -371,7 +371,7 @@ void ModbusTCPMaster::connect( ost::InetAddress addr, int port )
{
ostringstream s;
s << "(ModbusTCPMaster): connection " << s.str() << " error: " << e.what();
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
}
}
catch( ... )
......@@ -380,7 +380,7 @@ void ModbusTCPMaster::connect( ost::InetAddress addr, int port )
{
ostringstream s;
s << "(ModbusTCPMaster): connection " << s.str() << " error: catch ...";
dlog[Debug::CRIT] << s.str() << std::endl;
dlog.crit() << s.str() << std::endl;
}
}
// }
......@@ -388,8 +388,8 @@ void ModbusTCPMaster::connect( ost::InetAddress addr, int port )
// -------------------------------------------------------------------------
void ModbusTCPMaster::disconnect()
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << iaddr << "(ModbusTCPMaster): disconnect." << endl;
if( dlog.is_info() )
dlog.info() << iaddr << "(ModbusTCPMaster): disconnect." << endl;
if( !tcp )
return;
......
src/Communications/Modbus/ModbusTCPServer.cc
View file @ dc1fabfe
......@@ -183,9 +183,9 @@ mbErrCode ModbusTCPServer::tcp_processing( ost::TCPStream& tcp, ModbusTCP::MBAPH
mhead.swapdata();
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << "(ModbusTCPServer::tcp_processing): recv tcp header(" << len << "): ";
dlog.info() << "(ModbusTCPServer::tcp_processing): recv tcp header(" << len << "): ";
mbPrintMessage( dlog, (ModbusByte*)(&mhead), sizeof(mhead));
dlog(Debug::INFO) << endl;
}
......@@ -198,8 +198,8 @@ mbErrCode ModbusTCPServer::tcp_processing( ost::TCPStream& tcp, ModbusTCP::MBAPH
if( len<mhead.len )
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPServer::tcp_processing): len(" << (int)len
if( dlog.is_info() )
dlog.info() << "(ModbusTCPServer::tcp_processing): len(" << (int)len
<< ") < mhead.len(" << (int)mhead.len << ")" << endl;
return erInvalidFormat;
......@@ -219,9 +219,9 @@ mbErrCode ModbusTCPServer::pre_send_request( ModbusMessage& request )
curQueryHeader.len -= szCRC;
curQueryHeader.swapdata();
if( dlog.debugging(Debug::INFO) )
if( dlog.is_info() )
{
dlog[Debug::INFO] << "(ModbusTCPServer::pre_send_request): send tcp header: ";
dlog.info() << "(ModbusTCPServer::pre_send_request): send tcp header: ";
mbPrintMessage( dlog, (ModbusByte*)(&curQueryHeader), sizeof(curQueryHeader));
dlog(Debug::INFO) << endl;
}
......@@ -245,8 +245,8 @@ void ModbusTCPServer::cleanInputStream()
// -------------------------------------------------------------------------
void ModbusTCPServer::terminate()
{
if( dlog.debugging(Debug::INFO) )
dlog[Debug::INFO] << "(ModbusTCPServer): terminate..." << endl;
if( dlog.is_info() )
dlog.info() << "(ModbusTCPServer): terminate..." << endl;
if( tcp && tcp.isConnected() )
tcp.disconnect();
......
src/Interfaces/UniversalInterface.cc
View file @ dc1fabfe
......@@ -184,7 +184,7 @@ long UniversalInterface::getValue( ObjectId name, ObjectId node )
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(name, node);
throw UniSetTypes::TimeOut(set_err("UI(getValue): TimeOut",name,node));
......@@ -202,7 +202,7 @@ void UniversalInterface::setUndefinedState( IOController_i::SensorInfo& si, bool
{
if( si.id == DefaultObjectId )
{
unideb[Debug::WARN] << "UI(setUndefinedState): ID=UniSetTypes::DefaultObjectId" << endl;
ulog.warn() << "UI(setUndefinedState): ID=UniSetTypes::DefaultObjectId" << endl;
return;
}
......@@ -240,7 +240,7 @@ void UniversalInterface::setUndefinedState( IOController_i::SensorInfo& si, bool
catch(IOController_i::NameNotFound &ex)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(setUndefinedState):"+string(ex.err),si.id,si.node) << endl;
ulog.warn() << set_err("UI(setUndefinedState):"+string(ex.err),si.id,si.node) << endl;
}
catch(IOController_i::IOBadParam& ex)
{
......@@ -251,24 +251,24 @@ void UniversalInterface::setUndefinedState( IOController_i::SensorInfo& si, bool
{
rcache.erase(si.id, si.node);
// не смогли получить ссылку на объект
unideb[Debug::WARN] << set_err("UI(setUndefinedState): resolve failed",si.id,si.node) << endl;
ulog.warn() << set_err("UI(setUndefinedState): resolve failed",si.id,si.node) << endl;
}
catch(CORBA::NO_IMPLEMENT)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(setUndefinedState): method no implement",si.id,si.node) << endl;
ulog.warn() << set_err("UI(setUndefinedState): method no implement",si.id,si.node) << endl;
}
catch(CORBA::OBJECT_NOT_EXIST)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(setUndefinedState): object not exist",si.id,si.node) << endl;
ulog.warn() << set_err("UI(setUndefinedState): object not exist",si.id,si.node) << endl;
}
catch(CORBA::COMM_FAILURE){}
catch(CORBA::SystemException& ex){}
catch(...){}
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(setUndefinedState): Timeout",si.id,si.node) << endl;
ulog.warn() << set_err("UI(setUndefinedState): Timeout",si.id,si.node) << endl;
}
// ------------------------------------------------------------------------------------------------------------
/*!
......@@ -347,7 +347,7 @@ void UniversalInterface::setValue(ObjectId name, long value, ObjectId node)
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(setValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(setValue): CORBA::SystemException" << endl;
}
rcache.erase(name, node);
throw UniSetTypes::TimeOut(set_err("UI(setValue): Timeout",name,node));
......@@ -382,7 +382,7 @@ void UniversalInterface::fastSetValue( IOController_i::SensorInfo& si, long valu
{
if ( si.id == DefaultObjectId )
{
unideb[Debug::WARN] << "UI(fastSetValue): ID=UniSetTypes::DefaultObjectId" << endl;
ulog.warn() << "UI(fastSetValue): ID=UniSetTypes::DefaultObjectId" << endl;
return;
}
......@@ -420,7 +420,7 @@ void UniversalInterface::fastSetValue( IOController_i::SensorInfo& si, long valu
catch(IOController_i::NameNotFound &ex)
{
rcache.erase(si.id,si.node);
unideb[Debug::WARN] << set_err("UI(fastSetValue): NameNotFound для объекта",si.id,si.node) << endl;
ulog.warn() << set_err("UI(fastSetValue): NameNotFound для объекта",si.id,si.node) << endl;
}
catch(IOController_i::IOBadParam& ex)
{
......@@ -431,17 +431,17 @@ void UniversalInterface::fastSetValue( IOController_i::SensorInfo& si, long valu
{
rcache.erase(si.id,si.node);
// не смогли получить ссылку на объект
unideb[Debug::WARN] << set_err("UI(fastSetValue): resolve failed ",si.id,si.node) << endl;
ulog.warn() << set_err("UI(fastSetValue): resolve failed ",si.id,si.node) << endl;
}
catch(CORBA::NO_IMPLEMENT)
{
rcache.erase(si.id,si.node);
unideb[Debug::WARN] << set_err("UI(fastSetValue): method no implement",si.id,si.node) << endl;
ulog.warn() << set_err("UI(fastSetValue): method no implement",si.id,si.node) << endl;
}
catch(CORBA::OBJECT_NOT_EXIST)
{
rcache.erase(si.id,si.node);
unideb[Debug::WARN] << set_err("UI(fastSetValue): object not exist",si.id,si.node) << endl;
ulog.warn() << set_err("UI(fastSetValue): object not exist",si.id,si.node) << endl;
}
catch(CORBA::COMM_FAILURE& ex)
{
......@@ -450,12 +450,12 @@ void UniversalInterface::fastSetValue( IOController_i::SensorInfo& si, long valu
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(setValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(setValue): CORBA::SystemException" << endl;
}
catch(...){}
rcache.erase(si.id,si.node);
unideb[Debug::WARN] << set_err("UI(fastSetValue): Timeout",si.id,si.node) << endl;
ulog.warn() << set_err("UI(fastSetValue): Timeout",si.id,si.node) << endl;
}
......@@ -542,12 +542,12 @@ void UniversalInterface::askRemoteSensor( ObjectId name, UniversalIO::UIOCommand
catch(CORBA::COMM_FAILURE& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(askSensor): ошибка системы коммуникации" << endl;
// ulog.warn() << "UI(askSensor): ошибка системы коммуникации" << endl;
}
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(askSensor): CORBA::SystemException" << endl;
// ulog.warn() << "UI(askSensor): CORBA::SystemException" << endl;
}
rcache.erase(name, node);
......@@ -628,12 +628,12 @@ IOType UniversalInterface::getIOType(ObjectId name, ObjectId node)
catch(CORBA::COMM_FAILURE& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getIOType): ошибка системы коммуникации" << endl;
// ulog.warn() << "UI(getIOType): ошибка системы коммуникации" << endl;
}
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getIOType): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getIOType): CORBA::SystemException" << endl;
}
rcache.erase(name, node);
......@@ -710,12 +710,12 @@ ObjectType UniversalInterface::getType(ObjectId name, ObjectId node)
catch(CORBA::COMM_FAILURE& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getType): ошибка системы коммуникации" << endl;
// ulog.warn() << "UI(getType): ошибка системы коммуникации" << endl;
}
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getType): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getType): CORBA::SystemException" << endl;
}
catch(UniSetTypes::TimeOut){}
......@@ -814,14 +814,14 @@ ObjectPtr UniversalInterface::resolve( ObjectId rid , ObjectId node, int timeout
// сразу выдаём ошибку
// if( CORBA::is_nil(localctx) )
// {
if( unideb.debugging(Debug::WARN) )
if( ulog.is_warn() )
{
unideb[Debug::WARN] << "not found IOR-file for " << uconf->oind->getNameById(rid,node) << endl;
ulog.warn() << "not found IOR-file for " << uconf->oind->getNameById(rid,node) << endl;
}
throw UniSetTypes::ResolveNameError();
// }
// иначе пытаемся получить ссылку через NameService (omniNames)
// unideb[Debug::WARN] << "не найден IOR-файл для " << uconf->oind->getNameById(rid,node)
// ulog.warn() << "не найден IOR-файл для " << uconf->oind->getNameById(rid,node)
// << " пытаемся получить доступ через NameService \n";
}
......@@ -838,12 +838,12 @@ ObjectPtr UniversalInterface::resolve( ObjectId rid , ObjectId node, int timeout
{
try
{
// // unideb[Debug::INFO] << "пытаемся связаться с "<< node << endl;
// // ulog.info() << "пытаемся связаться с "<< node << endl;
if( CORBA::is_nil(orb) )
orb = uconf->getORB();
ctx = ORepHelpers::getRootNamingContext( orb, nodeName.c_str() );
// // unideb[Debug::INFO] << "ok. "<< endl;
// // ulog.info() << "ok. "<< endl;
break;
}
// catch(CORBA::COMM_FAILURE& ex )
......@@ -860,7 +860,7 @@ ObjectPtr UniversalInterface::resolve( ObjectId rid , ObjectId node, int timeout
if( CORBA::is_nil(ctx) )
{
// unideb[Debug::WARN] << "NameService недоступен на узле "<< node << endl;
// ulog.warn() << "NameService недоступен на узле "<< node << endl;
throw NSResolveError();
}
}
......@@ -918,7 +918,7 @@ ObjectPtr UniversalInterface::resolve( ObjectId rid , ObjectId node, int timeout
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(resolve): CORBA::SystemException" << endl;
// ulog.warn() << "UI(resolve): CORBA::SystemException" << endl;
throw UniSetTypes::TimeOut();
}
......@@ -1000,12 +1000,12 @@ void UniversalInterface::send( ObjectId name, TransportMessage& msg, ObjectId no
catch(CORBA::COMM_FAILURE& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(send): ошибка системы коммуникации" << endl;
// ulog.warn() << "UI(send): ошибка системы коммуникации" << endl;
}
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(send): CORBA::SystemException" << endl;
// ulog.warn() << "UI(send): CORBA::SystemException" << endl;
}
rcache.erase(name, node);
......@@ -1057,7 +1057,7 @@ IOController_i::ShortIOInfo UniversalInterface::getChangedTime( UniSetTypes::Obj
catch(IOController_i::NameNotFound &ex)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << "UI(getChangedTime): " << ex.err << endl;
ulog.warn() << "UI(getChangedTime): " << ex.err << endl;
}
catch(IOController_i::IOBadParam& ex )
{
......@@ -1067,27 +1067,27 @@ IOController_i::ShortIOInfo UniversalInterface::getChangedTime( UniSetTypes::Obj
catch(ORepFailed)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(getChangedTime): resolve failed ",si.id,si.node) << endl;
ulog.warn() << set_err("UI(getChangedTime): resolve failed ",si.id,si.node) << endl;
}
catch(CORBA::NO_IMPLEMENT)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(getChangedTime): method no implement",si.id,si.node) << endl;
ulog.warn() << set_err("UI(getChangedTime): method no implement",si.id,si.node) << endl;
}
catch(CORBA::OBJECT_NOT_EXIST)
{
rcache.erase(si.id, si.node);
unideb[Debug::WARN] << set_err("UI(getChangedTime): object not exist",si.id,si.node) << endl;
ulog.warn() << set_err("UI(getChangedTime): object not exist",si.id,si.node) << endl;
}
catch(CORBA::COMM_FAILURE)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(saveState): CORBA::COMM_FAILURE " << endl;
// ulog.warn() << "UI(saveState): CORBA::COMM_FAILURE " << endl;
}
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(saveState): CORBA::SystemException" << endl;
// ulog.warn() << "UI(saveState): CORBA::SystemException" << endl;
}
catch(...){}
......@@ -1139,8 +1139,8 @@ bool UniversalInterface::CacheOfResolve::clean()
{
UniSetTypes::uniset_rwmutex_wrlock l(cmutex);
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "UI: clean cache...."<< endl;
if( ulog.is_info() )
ulog.info() << "UI: clean cache...."<< endl;
time_t tm = time(NULL)-CleanTime*60;
// remove_if(mcache.begin(), mcache.end(),OldRef_eq(tm));
......@@ -1195,7 +1195,7 @@ bool UniversalInterface::isExist( UniSetTypes::ObjectId id )
}
catch(UniSetTypes::Exception& ex)
{
// unideb[Debug::WARN] << "UI(isExist): " << ex << endl;
// ulog.warn() << "UI(isExist): " << ex << endl;
}
catch(...){}
return false;
......@@ -1326,12 +1326,12 @@ void UniversalInterface::askRemoteThreshold( UniSetTypes::ObjectId sid, UniSetTy
catch(CORBA::COMM_FAILURE& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(askThreshold): ошибка системы коммуникации" << endl;
// ulog.warn() << "UI(askThreshold): ошибка системы коммуникации" << endl;
}
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(askThreshold): CORBA::SystemException" << endl;
// ulog.warn() << "UI(askThreshold): CORBA::SystemException" << endl;
}
rcache.erase(sid, node);
throw UniSetTypes::TimeOut(set_err("UI(askThreshold): Timeout",sid,node));
......@@ -1403,7 +1403,7 @@ CORBA::Long UniversalInterface::getRawValue( const IOController_i::SensorInfo& s
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(si.id, si.node);
throw UniSetTypes::TimeOut(set_err("UI(getRawValue): Timeout",si.id,si.node));
......@@ -1483,7 +1483,7 @@ void UniversalInterface::calibrate(const IOController_i::SensorInfo& si,
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(si.id, si.node);
throw UniSetTypes::TimeOut(set_err("UI(calibrate): Timeout",si.id,si.node));
......@@ -1554,7 +1554,7 @@ IOController_i::CalibrateInfo UniversalInterface::getCalibrateInfo( const IOCont
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(si.id, si.node);
throw UniSetTypes::TimeOut(set_err("UI(getCalibrateInfo): Timeout",si.id,si.node));
......@@ -1632,7 +1632,7 @@ IOController_i::SensorInfoSeq_var UniversalInterface::getSensorSeq( UniSetTypes:
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(sid,conf->getLocalNode());
throw UniSetTypes::TimeOut(set_err("UI(getSensorSeq): Timeout",sid,conf->getLocalNode()));
......@@ -1708,7 +1708,7 @@ IDSeq_var UniversalInterface::setOutputSeq( const IOController_i::OutSeq& lst, U
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(lst[0].si.id,lst[0].si.node);
throw UniSetTypes::TimeOut(set_err("UI(setOutputSeq): Timeout",lst[0].si.id,lst[0].si.node));
......@@ -1797,7 +1797,7 @@ UniSetTypes::IDSeq_var UniversalInterface::askSensorsSeq( UniSetTypes::IDList& l
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(sid,conf->getLocalNode());
throw UniSetTypes::TimeOut(set_err("UI(askSensorSeq): Timeout",sid,conf->getLocalNode()));
......@@ -1865,7 +1865,7 @@ IOController_i::ShortMapSeq* UniversalInterface::getSensors( UniSetTypes::Object
catch(CORBA::SystemException& ex)
{
// ошибка системы коммуникации
// unideb[Debug::WARN] << "UI(getValue): CORBA::SystemException" << endl;
// ulog.warn() << "UI(getValue): CORBA::SystemException" << endl;
}
rcache.erase(id,node);
throw UniSetTypes::TimeOut(set_err("UI(getSensors): Timeout",id,node));
......
src/ObjectRepository/IORFile.cc
View file @ dc1fabfe
......@@ -54,7 +54,7 @@ void IORFile::setIOR( const ObjectId id, const ObjectId node, const string sior
if( !ior_file )
{
unideb[Debug::CRIT] << "(IORFile): не смог открыть файл "+fname << endl;
ulog.crit() << "(IORFile): не смог открыть файл "+fname << endl;
throw TimeOut("(IORFile): не смог создать ior-файл "+fname);
}
......
src/ObjectRepository/ORepHelpers.cc
View file @ dc1fabfe
......@@ -45,8 +45,8 @@ namespace ORepHelpers
CosNaming::NamingContext_ptr getContext(const string& cname, int argc, const char* const* argv, const string& nsName )throw(ORepFailed)
{
CORBA::ORB_var orb = CORBA::ORB_init( argc, (char**)argv );
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELP: orb init ok"<< endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELP: orb init ok"<< endl;
return getContext(orb, cname, nsName);
}
// --------------------------------------------------------------------------
......@@ -54,25 +54,26 @@ namespace ORepHelpers
{
CosNaming::NamingContext_var rootC;
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELPER(getContext): get rootcontext...(servname = "<< servname << ")" <<endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELPER(getContext): get rootcontext...(servname = "<< servname << ")" <<endl;
rootC = getRootNamingContext(orb, servname);
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELPER(getContext): get rootContect ok " << endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELPER(getContext): get rootContect ok " << endl;
if( CORBA::is_nil(rootC) )
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "OREPHELPER: не смог получить ссылку на NameServices"<< endl;
if( ulog.is_warn() )
ulog.warn() << "OREPHELPER: не смог получить ссылку на NameServices"<< endl;
throw ORepFailed("OREPHELPER(getContext): не смог получить ссылку на NameServices");
}
if ( cname.empty() )
return rootC._retn();
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELPER(getContext): get ref context " << cname << endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELPER(getContext): get ref context " << cname << endl;
CosNaming::Name_var ctxName = omniURI::stringToName(cname.c_str());
CosNaming::NamingContext_var ctx;
......@@ -90,14 +91,16 @@ namespace ORepHelpers
{
ostringstream err;
err << "OREPHELPER(getContext): не смог получить ссылку на контекст " << cname;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << err.str() << endl;
if( ulog.is_warn() )
ulog.warn() << err.str() << endl;
throw ORepFailed(err.str());
}
catch(const CosNaming::NamingContext::NotFound &nf)
{
ostringstream err;
err << "OREPHELPER(getContext): не найден контекст " << cname;
unideb[Debug::WARN] << err.str() << endl;
if( ulog.warn() )
ulog.warn() << err.str() << endl;
throw ORepFailed(err.str());
}
catch(const CosNaming::NamingContext::CannotProceed &np)
......@@ -105,34 +108,40 @@ namespace ORepHelpers
ostringstream err;
err << "OREPHELPER(getContext): catch CannotProced " << cname;
err << " bad part=" << omniURI::nameToString(np.rest_of_name);
unideb[Debug::WARN] << err.str() << endl;
if( ulog.is_warn() )
ulog.warn() << err.str() << endl;
throw ORepFailed(err.str());
}
catch(CORBA::SystemException& ex)
{
ostringstream err;
err << "OREPHELPER(getContext): поймали CORBA::SystemException: " << ex.NP_minorString();
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << err.str() << endl;
if( ulog.is_warn() )
ulog.warn() << err.str() << endl;
throw ORepFailed(err.str());
}
catch(CORBA::Exception&)
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "OREPHELPER(getContext): поймали CORBA::Exception." << endl;
if( ulog.is_warn() )
ulog.warn() << "OREPHELPER(getContext): поймали CORBA::Exception." << endl;
throw ORepFailed();
}
catch(omniORB::fatalException& fe)
{
ostringstream err;
err << "OREPHELPER(getContext): поймали omniORB::fatalException:";
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << err << endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << " file: " << fe.file() << endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << " line: " << fe.line() << endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << " mesg: " << fe.errmsg() << endl;
if( ulog.is_warn() )
{
ulog.warn() << err << endl;
ulog.warn() << " file: " << fe.file() << endl;
ulog.warn() << " line: " << fe.line() << endl;
ulog.warn() << " mesg: " << fe.errmsg() << endl;
}
throw ORepFailed(err.str());
}
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "getContext: получили "<< cname << endl;
if( ulog.is_repository() )
ulog.repository() << "getContext: получили "<< cname << endl;
// Если _var
// return CosNaming::NamingContext::_duplicate(ctx);
......@@ -151,8 +160,8 @@ namespace ORepHelpers
{
// cout << "ORepHelpers(getRootNamingContext): nsName->" << nsName << endl;
CORBA::Object_var initServ = orb->resolve_initial_references(nsName.c_str());
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELP: get rootcontext...(nsName = "<< nsName << ")" <<endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELP: get rootcontext...(nsName = "<< nsName << ")" <<endl;
rootContext = CosNaming::NamingContext::_narrow(initServ);
if (CORBA::is_nil(rootContext))
......@@ -161,14 +170,15 @@ namespace ORepHelpers
throw ORepFailed(err.c_str());
}
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELP: init NameService ok"<< endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELP: init NameService ok"<< endl;
}
catch(CORBA::ORB::InvalidName& ex)
{
ostringstream err;
err << "ORepHelpers(getRootNamingContext): InvalidName=" << nsName;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << err.str() << endl;
if( ulog.is_warn() )
ulog.warn() << err.str() << endl;
throw ORepFailed(err.str());
}
catch (CORBA::COMM_FAILURE& ex)
......@@ -188,8 +198,8 @@ namespace ORepHelpers
throw ORepFailed(err);
}
if( unideb.debugging(Debug::REPOSITORY) )
unideb[Debug::REPOSITORY] << "OREPHELP: get root context ok"<< endl;
if( ulog.is_repository() )
ulog.repository() << "OREPHELP: get root context ok"<< endl;
// // Если создан как _ptr
// return rootContext;
......
src/ObjectRepository/ObjectIndex_XML.cc
View file @ dc1fabfe
......@@ -119,12 +119,12 @@ unsigned int ObjectIndex_XML::read_section( UniXML& xml, const std::string sec,
{
if( (unsigned)ind >= omap.size() )
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
ostringstream msg;
msg << "(ObjectIndex_XML::build): не хватило размера массива maxSize=" << omap.size();
// throw OutOfRange(msg.str());
unideb[Debug::WARN] << msg.str() << "... Делаем resize + 100\n";
ulog.warn() << msg.str() << "... Делаем resize + 100\n";
}
omap.resize(omap.size()+100);
......@@ -135,7 +135,7 @@ unsigned int ObjectIndex_XML::read_section( UniXML& xml, const std::string sec,
{
ostringstream msg;
msg << "(ObjectIndex_XML::build):: не нашли параметр RootSection в конф. файле ";
unideb[Debug::CRIT] << msg.str() << endl;
ulog.crit() << msg.str() << endl;
throw SystemError(msg.str());
}
......@@ -199,12 +199,13 @@ unsigned int ObjectIndex_XML::read_section( UniXML& xml, const std::string sec,
if( (unsigned)ind >= omap.size() )
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
ostringstream msg;
msg << "(ObjectIndex_XML::build): не хватило размера массива maxSize=" << omap.size();
// throw OutOfRange(msg.str());
unideb[Debug::INFO] << msg.str() << "... Делаем resize + 100\n";
if( ulog.is_info() )
ulog.info() << msg.str() << "... Делаем resize + 100\n";
}
omap.resize(omap.size()+100);
}
......@@ -220,7 +221,7 @@ unsigned int ObjectIndex_XML::read_nodes( UniXML& xml, const std::string sec, un
ostringstream msg;
msg << "(ObjectIndex_XML::build): не хватило размера массива maxSize=" << omap.size();
// throw OutOfRange(msg.str());
unideb[Debug::WARN] << msg.str() << "... Делаем resize + 100\n";
ulog.warn() << msg.str() << "... Делаем resize + 100\n";
omap.resize(omap.size()+100);
}
......@@ -276,7 +277,7 @@ unsigned int ObjectIndex_XML::read_nodes( UniXML& xml, const std::string sec, un
ostringstream msg;
msg << "(ObjectIndex_XML::build): не хватило размера массива maxSize=" << omap.size();
// throw OutOfRange(msg.str());
unideb[Debug::WARN] << msg.str() << "... Делаем resize + 100\n";
ulog.warn() << msg.str() << "... Делаем resize + 100\n";
omap.resize(omap.size()+100);
}
}
......
src/ObjectRepository/ObjectIndex_idXML.cc
View file @ dc1fabfe
......@@ -93,7 +93,7 @@ void ObjectIndex_idXML::read_section( UniXML& xml, const std::string sec )
{
ostringstream msg;
msg << "(ObjectIndex_idXML::build):: не нашли параметр RootSection в конф. файле ";
unideb[Debug::CRIT] << msg.str() << endl;
ulog.crit() << msg.str() << endl;
throw SystemError(msg.str());
}
......
src/ObjectRepository/ObjectRepository.cc
View file @ dc1fabfe
......@@ -98,8 +98,8 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
{
ostringstream err;
if( unideb.debugging(Debug::type(Debug::INFO|Debug::REPOSITORY)) )
unideb[Debug::type(Debug::INFO|Debug::REPOSITORY)] << "ObjectRepository(registration): регистрируем " << name << endl;
if( ulog.is_info() )
ulog.info() << "ObjectRepository(registration): регистрируем " << name << endl;
// Проверка корректности имени
char bad = ORepHelpers::checkBadSymbols(name);
......@@ -127,8 +127,8 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
}
catch(const CosNaming::NamingContext::AlreadyBound &nf)
{
if( unideb.debugging(Debug::type(Debug::WARN|Debug::REPOSITORY)) )
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "(registration): "<< name <<" уже зарегестрирован в "<< section << "!!!" << endl;
if( ulog.is_warn() )
ulog.warn() << "(registration): "<< name <<" уже зарегестрирован в "<< section << "!!!" << endl;
if( !force )
throw ObjectNameAlready();
......@@ -136,35 +136,6 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
// разрегистриуем, перед повтроной попыткой
ctx->unbind(oName);
continue;
/*
// делаем проверку жив ли объект
bool life(false);
try
{
unideb[Debug::type(Debug::INFO|Debug::REPOSITORY)] << "(registration): " << name << " уже есть... проверяем живой ли? "<< endl;
CORBA::Object_var ref = ctx->resolve(oName);
UniSetObject_i_var uobj = UniSetObject_i::_narrow(ref);
uobj->getId(); // пытаемся вызвать функцию (любую), если не сможет сработает исключение
life = true;
unideb[Debug::type(Debug::INFO|Debug::REPOSITORY)] << "(registration): " << name << " живой! "<< endl;
}
catch(...)
{
life=false;
}
if( !life )
{
unideb(Debug::type(Debug::WARN|Debug::REPOSITORY)) << "(registration): " << name << " ЕСТЬ в репозитории, но недоступен. Заменяем на новую ссылку "<< endl;
ctx->rebind(oName, oRef);
}
else
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "(registration): "<< name <<" уже зарегестрирован в "<< section<< "!!!!!!!!!!!" << endl;
throw ObjectNameAlready();
}
return;
*/
}
catch(ORepFailed)
{
......@@ -186,14 +157,15 @@ void ObjectRepository::registration(const string& name, const ObjectPtr oRef, co
}
catch(CORBA::SystemException& ex)
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "ObjectRepository(registrartion): поймали CORBA::SystemException: "
if( ulog.is_warn() )
ulog.warn() << "ObjectRepository(registrartion): поймали CORBA::SystemException: "
<< ex.NP_minorString() << endl;
err << "ObjectRepository(registrartion): поймали CORBA::SystemException: " << ex.NP_minorString();
}
// catch(...)
// {
// unideb[Debug::WARN] << "поймали что-то неизвестное..."<< endl;
// ulog.warn() << "поймали что-то неизвестное..."<< endl;
// }
}
......@@ -231,23 +203,23 @@ void ObjectRepository::registration( const std::string& fullName, const UniSetTy
void ObjectRepository::unregistration(const string& name, const string& section)
throw(ORepFailed, NameNotFound)
{
// unideb[Debug::INFO] << "OREP: unregistration "<< name << " из "<< section << endl;
// ulog.info() << "OREP: unregistration "<< name << " из "<< section << endl;
ostringstream err;
CosNaming::Name_var oName = omniURI::stringToName(name.c_str());
// unideb[Debug::INFO] << "OREP: string to name ok"<< endl;
// ulog.info() << "OREP: string to name ok"<< endl;
CosNaming::NamingContext_var ctx;
CORBA::ORB_var orb = uconf->getORB();
ctx = ORepHelpers::getContext(orb, section, nsName);
// unideb[Debug::INFO] << "OREP: get context " << section <<" ok"<< endl;
// ulog.info() << "OREP: get context " << section <<" ok"<< endl;
try
{
// Удаляем запись об объекте
ctx->unbind(oName);
// unideb[Debug::INFO] << "OREP: ok" << endl;
// ulog.info() << "OREP: ok" << endl;
return;
}
catch(const CosNaming::NamingContext::NotFound &nf)
......@@ -372,7 +344,7 @@ bool ObjectRepository::listSections(const string& in_section, ListObjectName *ls
bool ObjectRepository::list(const string& section, ListObjectName *ls, unsigned int how_many, ObjectType type)
{
// Возвращает false если вынут не весь список...
// unideb[Debug::INFO] << "получаем список из "<< section << endl;
// ulog.info() << "получаем список из "<< section << endl;
CosNaming::NamingContext_var ctx;
try
{
......@@ -381,14 +353,14 @@ bool ObjectRepository::list(const string& section, ListObjectName *ls, unsigned
}
catch(ORepFailed)
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "ORepository(list): не смог получить ссылку на "<< section << endl;
ulog.warn() << "ORepository(list): не смог получить ссылку на "<< section << endl;
throw;
// return false;
}
if( CORBA::is_nil(ctx) )
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "ORepository(list): не смог получить ссылку на "<< section << endl;
ulog.warn() << "ORepository(list): не смог получить ссылку на "<< section << endl;
throw ORepFailed();
}
......@@ -463,10 +435,10 @@ bool ObjectRepository::isExist( ObjectPtr oref )
catch(CORBA::Exception&){}
catch(omniORB::fatalException& fe)
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "ObjectRepository(isExist): "<< "поймали omniORB::fatalException:" << endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << " file: " << fe.file() << endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << " line: " << fe.line() << endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << " mesg: " << fe.errmsg() << endl;
ulog.warn() << "ObjectRepository(isExist): "<< "поймали omniORB::fatalException:" << endl;
ulog.warn() << " file: " << fe.file() << endl;
ulog.warn() << " line: " << fe.line() << endl;
ulog.warn() << " mesg: " << fe.errmsg() << endl;
}
catch(...){}
......
src/ObjectRepository/ObjectRepositoryFactory.cc
View file @ dc1fabfe
......@@ -64,10 +64,11 @@ bool ObjectRepositoryFactory::createSection( const char* name, const char* in_se
throw ( InvalidObjectName(err.str().c_str()) );
}
unideb[Debug::REPOSITORY] << "CreateSection: name = "<< name << " in section = " << in_section << endl;
ulog.repository() << "CreateSection: name = "<< name << " in section = " << in_section << endl;
if( sizeof(in_section)==0 )
{
unideb[Debug::REPOSITORY] << "CreateSection: in_section=0"<< endl;
if( ulog.repository() )
ulog.repository() << "CreateSection: in_section=0"<< endl;
return createRootSection(name);
}
......@@ -92,13 +93,16 @@ bool ObjectRepositoryFactory::createSectionF(const string& fullName)throw(ORepFa
string name(ObjectIndex::getBaseName(fullName));
string sec(ORepHelpers::getSectionName(fullName));
unideb[Debug::REPOSITORY] << name << endl;
unideb[Debug::REPOSITORY] << sec << endl;
ulog.repository() << name << endl;
ulog.repository() << sec << endl;
if ( sec.empty() )
{
unideb[Debug::REPOSITORY] << "SectionName is empty!!!"<< endl;
unideb[Debug::REPOSITORY] << "Добавляем в "<< uconf->getRootSection() << endl;
if( ulog.repository() )
{
ulog.repository() << "SectionName is empty!!!"<< endl;
ulog.repository() << "Добавляем в "<< uconf->getRootSection() << endl;
}
return createSection(name, uconf->getRootSection());
}
else
......@@ -125,49 +129,59 @@ bool ObjectRepositoryFactory::createContext(const char *cname, CosNaming::Naming
CosNaming::Name_var nc = omniURI::stringToName(cname);
try
{
unideb[Debug::REPOSITORY] << "ORepFactory(createContext): создаю новый контекст "<< cname << endl;
if( ulog.repository() )
ulog.repository() << "ORepFactory(createContext): создаю новый контекст "<< cname << endl;
ctx->bind_new_context(nc);
unideb[Debug::REPOSITORY] << "ORepFactory(createContext): создал. " << endl;
if( ulog.repository() )
ulog.repository() << "ORepFactory(createContext): создал. " << endl;
return true;
}
catch(const CosNaming::NamingContext::AlreadyBound &ab)
{
// ctx->resolve(nc);
unideb[Debug::REPOSITORY] <<"ORepFactory(createContext): context "<< cname << " уже есть"<< endl;
if( ulog.repository() )
ulog.repository() <<"ORepFactory(createContext): context "<< cname << " уже есть"<< endl;
return true;
}
catch(CosNaming::NamingContext::NotFound)
{
unideb[Debug::REPOSITORY] <<"ORepFactory(createContext): NotFound "<< cname << endl;
if( ulog.repository() )
ulog.repository() <<"ORepFactory(createContext): NotFound "<< cname << endl;
throw NameNotFound();
}
catch(const CosNaming::NamingContext::InvalidName &nf)
{
// unideb[Debug::WARN] << "invalid name"<< endl;
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "ORepFactory(createContext): (InvalidName) " << cname;
if( ulog.is_warn() )
ulog.warn() << "ORepFactory(createContext): (InvalidName) " << cname;
}
catch(const CosNaming::NamingContext::CannotProceed &cp)
{
unideb[Debug::type(Debug::WARN|Debug::REPOSITORY)] << "ORepFactory(createContext): catch CannotProced "
if( ulog.is_crit() )
ulog.warn() << "ORepFactory(createContext): catch CannotProced "
<< cname << " bad part="
<< omniURI::nameToString(cp.rest_of_name);
throw NameNotFound();
}
catch( CORBA::SystemException& ex)
{
unideb[Debug::type(Debug::CRIT|Debug::REPOSITORY)] << "ORepFactory(createContext): CORBA::SystemException: "
if( ulog.is_crit() )
ulog.crit() << "ORepFactory(createContext): CORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(CORBA::Exception&)
{
unideb[Debug::type(Debug::CRIT|Debug::REPOSITORY)] << "поймали CORBA::Exception." << endl;
if( ulog.is_crit() )
ulog.crit() << "поймали CORBA::Exception." << endl;
}
catch(omniORB::fatalException& fe)
{
unideb[Debug::type(Debug::CRIT|Debug::REPOSITORY)] << "поймали omniORB::fatalException:" << endl;
unideb[Debug::type(Debug::CRIT|Debug::REPOSITORY)] << " file: " << fe.file() << endl;
unideb[Debug::type(Debug::CRIT|Debug::REPOSITORY)] << " line: " << fe.line() << endl;
unideb[Debug::type(Debug::CRIT|Debug::REPOSITORY)] << " mesg: " << fe.errmsg() << endl;
if( ulog.is_crit() )
{
ulog.crit() << "поймали omniORB::fatalException:" << endl;
ulog.crit() << " file: " << fe.file() << endl;
ulog.crit() << " line: " << fe.line() << endl;
ulog.crit() << " mesg: " << fe.errmsg() << endl;
}
}
return false;
......@@ -253,19 +267,19 @@ bool ObjectRepositoryFactory::removeSection(const string& fullName, bool recursi
if( recursive )
{
unideb[Debug::REPOSITORY] << "ORepFactory: удаляем рекурсивно..." << endl;
ulog.repository() << "ORepFactory: удаляем рекурсивно..." << endl;
string rctx = fullName+"/"+omniURI::nameToString(bl[i].binding_name);
unideb[Debug::REPOSITORY] << rctx << endl;
ulog.repository() << rctx << endl;
if ( !removeSection(rctx))
{
unideb[Debug::REPOSITORY] << "рекурсивно удалить не удалось" << endl;
ulog.repository() << "рекурсивно удалить не удалось" << endl;
rem = false;
}
}
else
{
unideb[Debug::REPOSITORY] << "ORepFactory: " << omniURI::nameToString(bl[i].binding_name) << " - контекст!!! ";
unideb[Debug::REPOSITORY] << "ORepFactory: пока не удаляем" << endl;
ulog.repository() << "ORepFactory: " << omniURI::nameToString(bl[i].binding_name) << " - контекст!!! ";
ulog.repository() << "ORepFactory: пока не удаляем" << endl;
rem = false;
}
}
......@@ -291,12 +305,12 @@ bool ObjectRepositoryFactory::removeSection(const string& fullName, bool recursi
}
catch(const CosNaming::NamingContext::NotEmpty &ne)
{
unideb[Debug::REPOSITORY] << "ORepFactory: контекст" << fullName << " не пустой " << endl;
ulog.repository() << "ORepFactory: контекст" << fullName << " не пустой " << endl;
rem = false;
}
catch( ORepFailed )
{
unideb[Debug::REPOSITORY] << "ORepFactory: не удаось получить ссылку на контекст " << in_sec << endl;
ulog.repository() << "ORepFactory: не удаось получить ссылку на контекст " << in_sec << endl;
rem=false;
}
}
......@@ -322,8 +336,8 @@ bool ObjectRepositoryFactory::renameSection( const string& newFName, const strin
try
{
// unideb[Debug::REPOSITORY] << "ORepFactory: в контексте "<< in_sec << endl;
// unideb[Debug::REPOSITORY] << "ORepFactory: переименовываем " << oldFName << " в " << newFName << endl;
// ulog.repository() << "ORepFactory: в контексте "<< in_sec << endl;
// ulog.repository() << "ORepFactory: переименовываем " << oldFName << " в " << newFName << endl;
int argc(uconf->getArgc());
const char * const* argv(uconf->getArgv());
CosNaming::NamingContext_var in_ctx = ORepHelpers::getContext(in_sec, argc, argv, nsName);
......
src/ObjectRepository/ObjectsActivator.cc
View file @ dc1fabfe
......@@ -104,7 +104,7 @@ void ObjectsActivator::init()
poa = root_poa->create_POA("my poa", pman, pl);
if( CORBA::is_nil(poa) )
unideb[Debug::CRIT] << myname << "(init): init poa failed!!!" << endl;
ulog.crit() << myname << "(init): init poa failed!!!" << endl;
gActivator=this;
atexit( ObjectsActivator::normalexit );
......@@ -117,7 +117,7 @@ ObjectsActivator::~ObjectsActivator()
{
if(!procterm )
{
unideb[Debug::SYSTEM] << myname << "(destructor): ..."<< endl << flush;
ulog.system() << myname << "(destructor): ..."<< endl << flush;
if( !omDestroy )
oaDestroy();
......@@ -138,11 +138,11 @@ void ObjectsActivator::oaDestroy(int signo)
if( !omDestroy )
{
omDestroy = true;
unideb[Debug::SYSTEM] << myname << "(oaDestroy): begin..."<< endl;
ulog.system() << myname << "(oaDestroy): begin..."<< endl;
unideb[Debug::SYSTEM] << myname << "(oaDestroy): terminate... " << endl;
ulog.system() << myname << "(oaDestroy): terminate... " << endl;
term(signo);
unideb[Debug::SYSTEM] << myname << "(oaDestroy): terminate ok. " << endl;
ulog.system() << myname << "(oaDestroy): terminate ok. " << endl;
try
{
......@@ -150,17 +150,19 @@ void ObjectsActivator::oaDestroy(int signo)
}
catch(...){}
unideb[Debug::SYSTEM] << myname << "(oaDestroy): pman deactivate... " << endl;
ulog.system() << myname << "(oaDestroy): pman deactivate... " << endl;
pman->deactivate(false,true);
unideb[Debug::SYSTEM] << myname << "(oaDestroy): pman deactivate ok. " << endl;
ulog.system() << myname << "(oaDestroy): pman deactivate ok. " << endl;
unideb[Debug::SYSTEM] << myname << "(oaDestroy): orb destroy... " << endl;
ulog.system() << myname << "(oaDestroy): orb destroy... " << endl;
try
{
orb->destroy();
}
catch(...){}
unideb[Debug::SYSTEM] << myname << "(oaDestroy): orb destroy ok."<< endl;
if( ulog.is_system() )
ulog.system() << myname << "(oaDestroy): orb destroy ok."<< endl;
if( orbthr )
{
......@@ -183,7 +185,8 @@ void ObjectsActivator::oaDestroy(int signo)
*/
void ObjectsActivator::run(bool thread)
{
unideb[Debug::SYSTEM] << myname << "(run): создаю менеджер "<< endl;
if( ulog.is_system() )
ulog.system() << myname << "(run): создаю менеджер "<< endl;
ObjectsManager::initPOA(this);
......@@ -195,26 +198,26 @@ void ObjectsActivator::run(bool thread)
getinfo(); // заполнение информации об объектах
active=true;
unideb[Debug::SYSTEM] << myname << "(run): активизируем менеджер"<<endl;
ulog.system() << myname << "(run): активизируем менеджер"<<endl;
pman->activate();
msleep(50);
set_signals(true);
if( thread )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(run): запускаемся с созданием отдельного потока... "<< endl;
if( ulog.is_info() )
ulog.info() << myname << "(run): запускаемся с созданием отдельного потока... "<< endl;
orbthr = new ThreadCreator<ObjectsActivator>(this, &ObjectsActivator::work);
if( !orbthr->start() )
{
unideb[Debug::CRIT] << myname << "(run): НЕ СМОГЛИ СОЗДАТЬ ORB-поток"<<endl;
ulog.crit() << myname << "(run): НЕ СМОГЛИ СОЗДАТЬ ORB-поток"<<endl;
throw SystemError("(ObjectsActivator::run): CREATE ORB THREAD FAILED");
}
}
else
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(run): запускаемся без создания отдельного потока... "<< endl;
if( ulog.is_info() )
ulog.info() << myname << "(run): запускаемся без создания отдельного потока... "<< endl;
work();
}
}
......@@ -230,26 +233,31 @@ void ObjectsActivator::stop()
{
active=false;
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(stop): disactivate... "<< endl;
if( ulog.is_system() )
ulog.system() << myname << "(stop): disactivate... "<< endl;
disactivate();
if( unideb.debugging(Debug::SYSTEM) )
if( ulog.is_system() )
{
unideb[Debug::SYSTEM] << myname << "(stop): disactivate ok. "<<endl;
unideb[Debug::SYSTEM] << myname << "(stop): discard request..."<< endl;
ulog.system() << myname << "(stop): disactivate ok. "<<endl;
ulog.system() << myname << "(stop): discard request..."<< endl;
}
pman->discard_requests(true);
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(stop): discard request ok."<< endl;
if( ulog.is_system() )
ulog.system() << myname << "(stop): discard request ok."<< endl;
/*
try
{
unideb[Debug::SYSTEM] << myname << "(stop):: shutdown orb... "<<endl;
ulog.system() << myname << "(stop):: shutdown orb... "<<endl;
orb->shutdown(false);
}
catch(...){}
unideb[Debug::SYSTEM] << myname << "(stop): shutdown ok."<< endl;
*/
if( ulog.is_system() )
ulog.system() << myname << "(stop): shutdown ok."<< endl;
}
}
......@@ -257,8 +265,8 @@ void ObjectsActivator::stop()
void ObjectsActivator::work()
{
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(work): запускаем orb на обработку запросов..."<< endl;
if( ulog.is_system() )
ulog.system() << myname << "(work): запускаем orb на обработку запросов..."<< endl;
try
{
if(orbthr)
......@@ -270,41 +278,41 @@ void ObjectsActivator::work()
}
catch(CORBA::SystemException& ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(work): поймали CORBA::SystemException: " << ex.NP_minorString() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(work): поймали CORBA::SystemException: " << ex.NP_minorString() << endl;
}
catch(CORBA::Exception& ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(work): поймали CORBA::Exception." << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(work): поймали CORBA::Exception." << endl;
}
catch(omniORB::fatalException& fe)
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(work): : поймали omniORB::fatalException:" << endl;
unideb[Debug::CRIT] << myname << "(work): file: " << fe.file() << endl;
unideb[Debug::CRIT] << myname << "(work): line: " << fe.line() << endl;
unideb[Debug::CRIT] << myname << "(work): mesg: " << fe.errmsg() << endl;
ulog.crit() << myname << "(work): : поймали omniORB::fatalException:" << endl;
ulog.crit() << myname << "(work): file: " << fe.file() << endl;
ulog.crit() << myname << "(work): line: " << fe.line() << endl;
ulog.crit() << myname << "(work): mesg: " << fe.errmsg() << endl;
}
}
catch(...)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(work): catch ..." << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(work): catch ..." << endl;
}
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(work): orb стоп!!!"<< endl;
if( ulog.is_system() )
ulog.system() << myname << "(work): orb стоп!!!"<< endl;
/*
unideb[Debug::SYSTEM] << myname << "(oaDestroy): orb destroy... " << endl;
ulog.system() << myname << "(oaDestroy): orb destroy... " << endl;
try
{
orb->destroy();
}
catch(...){}
unideb[Debug::SYSTEM] << myname << "(oaDestroy): orb destroy ok."<< endl;
ulog.system() << myname << "(oaDestroy): orb destroy ok."<< endl;
*/
}
// ------------------------------------------------------------------------------------------
......@@ -348,7 +356,8 @@ void ObjectsActivator::processingMessage( UniSetTypes::VoidMessage *msg )
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(processingMessage): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(processingMessage): " << ex << endl;
}
}
......@@ -359,13 +368,14 @@ void ObjectsActivator::sysCommand( UniSetTypes::SystemMessage *sm )
{
case SystemMessage::LogRotate:
{
unideb[Debug::SYSTEM] << myname << "(sysCommand): logRotate" << endl;
if( ulog.is_system() )
ulog.system() << myname << "(sysCommand): logRotate" << endl;
// переоткрываем логи
string fname = unideb.getLogFile();
string fname = ulog.getLogFile();
if( !fname.empty() )
{
unideb.logFile(fname.c_str());
unideb << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
ulog.logFile(fname.c_str());
ulog << myname << "(sysCommand): ***************** UNIDEB LOG ROTATE *****************" << endl;
}
}
break;
......@@ -376,7 +386,7 @@ void ObjectsActivator::sysCommand( UniSetTypes::SystemMessage *sm )
/*
void ObjectsActivator::sig_child(int signo)
{
unideb[Debug::SYSTEM] << gActivator->getName() << "(sig_child): дочерний процесс закончил работу...(sig=" << signo << ")" << endl;
ulog.system() << gActivator->getName() << "(sig_child): дочерний процесс закончил работу...(sig=" << signo << ")" << endl;
while( waitpid(-1, 0, WNOHANG) > 0);
}
*/
......@@ -419,8 +429,8 @@ void ObjectsActivator::finishterm( int signo )
{
if( !doneterm )
{
if( unideb.debugging(Debug::SYSTEM) && gActivator )
unideb[Debug::SYSTEM] << gActivator->getName()
if( ulog.is_system() && gActivator )
ulog.system() << gActivator->getName()
<< "(finishterm): прерываем процесс завершения...!" << endl<< flush;
if( gActivator )
......@@ -446,10 +456,10 @@ void ObjectsActivator::terminated( int signo )
procterm = 1;
SIGNO = signo;
MYPID = getpid();
if( unideb.debugging(Debug::SYSTEM) && gActivator )
if( ulog.is_system() && gActivator )
{
unideb[Debug::SYSTEM] << gActivator->getName() << "(terminated): catch SIGNO="<< signo << "("<< strsignal(signo) <<")"<< endl << flush;
unideb[Debug::SYSTEM] << gActivator->getName() << "(terminated): устанавливаем timer завершения на "
ulog.system() << gActivator->getName() << "(terminated): catch SIGNO="<< signo << "("<< strsignal(signo) <<")"<< endl << flush;
ulog.system() << gActivator->getName() << "(terminated): устанавливаем timer завершения на "
<< TERMINATE_TIMEOUT << " сек " << endl << flush;
}
sighold(SIGALRM);
......@@ -460,8 +470,8 @@ void ObjectsActivator::terminated( int signo )
gActivator->oaDestroy(SIGNO); // gActivator->term(SIGNO);
doneterm = 1;
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << gActivator->getName() << "(terminated): завершаемся..."<< endl<< flush;
if( ulog.is_system() )
ulog.system() << gActivator->getName() << "(terminated): завершаемся..."<< endl<< flush;
if( gActivator )
ObjectsActivator::set_signals(false);
......@@ -474,21 +484,21 @@ void ObjectsActivator::terminated( int signo )
void ObjectsActivator::normalexit()
{
if( gActivator && unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << gActivator->getName() << "(default exit): good bye."<< endl << flush;
if( gActivator && ulog.is_system() )
ulog.system() << gActivator->getName() << "(default exit): good bye."<< endl << flush;
}
void ObjectsActivator::normalterminate()
{
if( gActivator )
unideb[Debug::CRIT] << gActivator->getName() << "(default exception terminate): Никто не выловил исключение!!! Good bye."<< endl<< flush;
ulog.crit() << gActivator->getName() << "(default exception terminate): Никто не выловил исключение!!! Good bye."<< endl<< flush;
// abort();
}
// ------------------------------------------------------------------------------------------
void ObjectsActivator::term( int signo )
{
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(term): TERM" << endl;
if( ulog.is_system() )
ulog.system() << myname << "(term): TERM" << endl;
if( doneterm )
return;
......@@ -498,21 +508,21 @@ void ObjectsActivator::term( int signo )
try
{
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(term): вызываем sigterm()" << endl;
if( ulog.is_system() )
ulog.system() << myname << "(term): вызываем sigterm()" << endl;
sigterm(signo);
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(term): sigterm() ok." << endl;
if( ulog.is_system() )
ulog.system() << myname << "(term): sigterm() ok." << endl;
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(term): " << ex << endl;
ulog.crit() << myname << "(term): " << ex << endl;
}
catch(...){}
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << myname << "(term): END TERM" << endl;
if( ulog.is_system() )
ulog.system() << myname << "(term): END TERM" << endl;
}
// ------------------------------------------------------------------------------------------
void ObjectsActivator::waitDestroy()
......
src/ObjectRepository/ObjectsManager.cc
View file @ dc1fabfe
......@@ -137,7 +137,7 @@ void ObjectsManager::initPOA( ObjectsManager* rmngr )
poa = rmngr->getPOA();
if( CORBA::is_nil(poa) )
unideb[Debug::CRIT] << myname << "(initPOA): failed init poa " << endl;
ulog.crit() << myname << "(initPOA): failed init poa " << endl;
// Инициализация самого менеджера и его подобъектов
UniSetObject::init(rmngr);
......@@ -152,8 +152,8 @@ bool ObjectsManager::addObject( UniSetObject *obj )
ObjectsList::iterator li=find(olist.begin(),olist.end(), obj);
if( li==olist.end() )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(activator): добавляем объект "<< obj->getName()<< endl;
if( ulog.is_info() )
ulog.info() << myname << "(activator): добавляем объект "<< obj->getName()<< endl;
olist.push_back(obj);
}
} // unlock
......@@ -168,28 +168,28 @@ bool ObjectsManager::removeObject(UniSetObject* obj)
ObjectsList::iterator li=find(olist.begin(),olist.end(), obj);
if( li!=olist.end() )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(activator): удаляем объект "<< obj->getName()<< endl;
if( ulog.is_info() )
ulog.info() << myname << "(activator): удаляем объект "<< obj->getName()<< endl;
try
{
obj->disactivate();
}
catch(Exception& ex)
{
unideb[Debug::WARN] << myname << "(removeObject): " << ex << endl;
ulog.warn() << myname << "(removeObject): " << ex << endl;
}
catch(CORBA::SystemException& ex)
{
unideb[Debug::WARN] << myname << "(removeObject): поймали CORBA::SystemException: " << ex.NP_minorString() << endl;
ulog.warn() << myname << "(removeObject): поймали CORBA::SystemException: " << ex.NP_minorString() << endl;
}
catch(CORBA::Exception& ex)
{
unideb[Debug::WARN] << myname << "(removeObject): CORBA::Exception" << endl;
ulog.warn() << myname << "(removeObject): CORBA::Exception" << endl;
}
catch( omniORB::fatalException& fe )
{
unideb[Debug::CRIT] << myname << "(managers): Caught omniORB::fatalException:" << endl;
unideb[Debug::CRIT] << myname << "(managers): file: " << fe.file()
ulog.crit() << myname << "(managers): Caught omniORB::fatalException:" << endl;
ulog.crit() << myname << "(managers): file: " << fe.file()
<< " line: " << fe.line()
<< " mesg: " << fe.errmsg() << endl;
}
......@@ -208,8 +208,8 @@ bool ObjectsManager::removeObject(UniSetObject* obj)
*/
void ObjectsManager::managers(OManagerCommand cmd)
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname <<"(managers): mlist.size="
if( ulog.is_info() )
ulog.info() << myname <<"(managers): mlist.size="
<< mlist.size() << " cmd=" << cmd << endl;
{ //lock
uniset_rwmutex_rlock lock(mlistMutex);
......@@ -241,28 +241,28 @@ void ObjectsManager::managers(OManagerCommand cmd)
}
catch( Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(managers): " << ex << endl;
unideb[Debug::CRIT] << myname << "(managers): не смог зарегистрировать (разрегистрировать) объект -->"<< (*li)->getName() << endl;
ulog.crit() << myname << "(managers): " << ex << endl;
ulog.crit() << myname << "(managers): не смог зарегистрировать (разрегистрировать) объект -->"<< (*li)->getName() << endl;
}
}
catch(CORBA::SystemException& ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(managers): поймали CORBA::SystemException:" << ex.NP_minorString() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(managers): поймали CORBA::SystemException:" << ex.NP_minorString() << endl;
}
catch( CORBA::Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(managers): Caught CORBA::Exception. " << ex._name() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(managers): Caught CORBA::Exception. " << ex._name() << endl;
}
catch( omniORB::fatalException& fe )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(managers): Caught omniORB::fatalException:" << endl;
unideb[Debug::CRIT] << myname << "(managers): file: " << fe.file()
ulog.crit() << myname << "(managers): Caught omniORB::fatalException:" << endl;
ulog.crit() << myname << "(managers): file: " << fe.file()
<< " line: " << fe.line()
<< " mesg: " << fe.errmsg() << endl;
}
......@@ -276,8 +276,8 @@ void ObjectsManager::managers(OManagerCommand cmd)
*/
void ObjectsManager::objects(OManagerCommand cmd)
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname <<"(objects): olist.size="
if( ulog.is_info() )
ulog.info() << myname <<"(objects): olist.size="
<< olist.size() << " cmd=" << cmd << endl;
{ //lock
uniset_rwmutex_rlock lock(olistMutex);
......@@ -310,30 +310,30 @@ void ObjectsManager::objects(OManagerCommand cmd)
}
catch( Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(objects): " << ex << endl;
unideb[Debug::CRIT] << myname << "(objects): не смог зарегистрировать (разрегистрировать) объект -->"<< (*li)->getName() << endl;
ulog.crit() << myname << "(objects): " << ex << endl;
ulog.crit() << myname << "(objects): не смог зарегистрировать (разрегистрировать) объект -->"<< (*li)->getName() << endl;
}
}
catch(CORBA::SystemException& ex)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(objects): поймали CORBA::SystemException:" << ex.NP_minorString() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(objects): поймали CORBA::SystemException:" << ex.NP_minorString() << endl;
}
catch( CORBA::Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(objects): Caught CORBA::Exception. "
if( ulog.is_crit() )
ulog.crit() << myname << "(objects): Caught CORBA::Exception. "
<< ex._name()
<< " (" << (*li)->getName() << ")" << endl;
}
catch( omniORB::fatalException& fe )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(objects): Caught omniORB::fatalException:" << endl;
unideb[Debug::CRIT] << myname << "(objects): file: " << fe.file()
ulog.crit() << myname << "(objects): Caught omniORB::fatalException:" << endl;
ulog.crit() << myname << "(objects): file: " << fe.file()
<< " line: " << fe.line()
<< " mesg: " << fe.errmsg() << endl;
}
......@@ -348,8 +348,8 @@ void ObjectsManager::objects(OManagerCommand cmd)
*/
bool ObjectsManager::activateObject()
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(activateObjects): активизирую объекты"<< endl;
if( ulog.is_info() )
ulog.info() << myname << "(activateObjects): активизирую объекты"<< endl;
UniSetObject::activateObject();
managers(activ);
objects(activ);
......@@ -362,8 +362,8 @@ bool ObjectsManager::activateObject()
*/
bool ObjectsManager::disactivateObject()
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(disactivateObjects): деактивизирую объекты"<< endl;
if( ulog.is_info() )
ulog.info() << myname << "(disactivateObjects): деактивизирую объекты"<< endl;
// именно в такой последовательности!
objects(deactiv);
managers(deactiv);
......@@ -372,7 +372,7 @@ bool ObjectsManager::disactivateObject()
// ------------------------------------------------------------------------------------------
void ObjectsManager::sigterm( int signo )
{
// unideb[Debug::INFO] << "ObjectsActivator: default processing signo="<< signo << endl;
// ulog.info() << "ObjectsActivator: default processing signo="<< signo << endl;
sig=signo;
objects(term);
managers(term);
......@@ -409,11 +409,11 @@ bool ObjectsManager::addManager( ObjectsManager *child )
if(it == mlist.end() )
{
mlist.push_back( child );
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": добавляем менеджер "<< child->getName()<< endl;
if( ulog.is_info() )
ulog.info() << myname << ": добавляем менеджер "<< child->getName()<< endl;
}
else if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << ": попытка повторного добавления объекта "<< child->getName() << endl;
else if( ulog.is_warn() )
ulog.warn() << myname << ": попытка повторного добавления объекта "<< child->getName() << endl;
} // unlock
return true;
......@@ -505,11 +505,11 @@ int ObjectsManager::getObjectsInfo( ObjectsManager* mngr, SimpleInfoSeq* seq,
}
catch(CORBA::Exception& ex)
{
unideb[Debug::WARN] << myname << "(getObjectsInfo): CORBA::Exception" << endl;
ulog.warn() << myname << "(getObjectsInfo): CORBA::Exception" << endl;
}
catch(...)
{
unideb[Debug::WARN] << myname << "(getObjectsInfo): не смог получить у объекта "
ulog.warn() << myname << "(getObjectsInfo): не смог получить у объекта "
<< conf->oind->getNameById( (*it)->getId() ) << " информацию" << endl;
}
}
......
src/ObjectRepository/ObjectsManager_LT.cc
View file @ dc1fabfe
......@@ -61,7 +61,7 @@ void ObjectsManager_LT::callback()
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(callback): " << ex << endl;
ulog.crit() << myname << "(callback): " << ex << endl;
}
}
// ------------------------------------------------------------------------------------------
......
src/ObjectRepository/PassiveObject.cc
View file @ dc1fabfe
......@@ -117,13 +117,13 @@ void PassiveObject::processingMessage( UniSetTypes::VoidMessage* msg )
}
default:
//unideb[Debug::WARN] << myname << ": неизвестное сообщение " << msg->type << endl;
//ulog.warn() << myname << ": неизвестное сообщение " << msg->type << endl;
break;
}
}
catch(Exception& ex)
{
// unideb[Debug::WARN]
// ulog.warn()
// cerr << myname << "(processingMessage): " << ex << endl;
}
}
......
src/ObjectRepository/ProxyManager.cc
View file @ dc1fabfe
......@@ -48,7 +48,7 @@ void ProxyManager::attachObject( PassiveObject* po, UniSetTypes::ObjectId id )
{
if( id == DefaultObjectId )
{
unideb[Debug::WARN] << myname << "(attachObject): попытка добавить объект с id="
ulog.warn() << myname << "(attachObject): попытка добавить объект с id="
<< DefaultObjectId << " PassiveObject=" << po->getName() << endl;
return;
......@@ -81,9 +81,9 @@ bool ProxyManager::activateObject()
{
try
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << myname << "(registered): попытка "
ulog.info() << myname << "(registered): попытка "
<< i+1 << " регистриую (id=" << it->first << ") "
<< " (pname=" << it->second->getName() << ") "
<< conf->oind->getNameById(it->first) << endl;
......@@ -93,21 +93,24 @@ bool ProxyManager::activateObject()
}
catch( UniSetTypes::ObjectNameAlready& ex )
{
unideb[Debug::CRIT] << myname << "(registered): СПЕРВА РАЗРЕГИСТРИРУЮ (ObjectNameAlready)" << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(registered): СПЕРВА РАЗРЕГИСТРИРУЮ (ObjectNameAlready)" << endl;
try
{
ui.unregister(it->first);
}
catch(Exception & ex)
{
unideb[Debug::CRIT] << myname << "(unregistered): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(unregistered): " << ex << endl;
}
}
}
}
catch(Exception& ex )
catch( Exception& ex )
{
unideb[Debug::CRIT] << myname << "(activate): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(activate): " << ex << endl;
}
}
......@@ -124,7 +127,8 @@ bool ProxyManager::disactivateObject()
}
catch(Exception& ex )
{
unideb[Debug::CRIT] << myname << "(activate): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(activate): " << ex << endl;
}
}
......@@ -146,9 +150,9 @@ void ProxyManager::processingMessage( UniSetTypes::VoidMessage *msg )
PObjectMap::iterator it = omap.find(msg->consumer);
if( it!=omap.end() )
it->second->processingMessage(msg);
else
else if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(processingMessage): не найден объект "
ulog.crit() << myname << "(processingMessage): не найден объект "
<< " consumer= " << msg->consumer << endl;
}
}
......@@ -157,7 +161,8 @@ void ProxyManager::processingMessage( UniSetTypes::VoidMessage *msg )
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << myname << "(processingMessage): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(processingMessage): " << ex << endl;
}
}
// -------------------------------------------------------------------------
......@@ -171,7 +176,8 @@ void ProxyManager::allMessage( UniSetTypes::VoidMessage* msg )
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << myname << "(allMessage): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(allMessage): " << ex << endl;
}
}
}
......
src/ObjectRepository/UniSetObject.cc
View file @ dc1fabfe
......@@ -123,7 +123,7 @@ stCountOfQueueFull(0)
myid = ui.getIdByName(myname);
if( myid == DefaultObjectId )
{
unideb[Debug::WARN] << "name: my ID not found!" << endl;
ulog.warn() << "name: my ID not found!" << endl;
throw Exception(name+": my ID not found!");
}
......@@ -157,9 +157,9 @@ void UniSetObject::init_object()
if( MaxCountRemoveOfMessage <= 0 )
MaxCountRemoveOfMessage = 10;
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << myname << "(init): SizeOfMessageQueue=" << SizeOfMessageQueue
ulog.info() << myname << "(init): SizeOfMessageQueue=" << SizeOfMessageQueue
<< " MaxCountRemoveOfMessage=" << MaxCountRemoveOfMessage
<< endl;
}
......@@ -172,11 +172,11 @@ void UniSetObject::init_object()
*/
bool UniSetObject::init( ObjectsManager* om )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": init..." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": init..." << endl;
this->mymngr = om;
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": init ok..." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": init ok..." << endl;
return true;
}
// ------------------------------------------------------------------------------------------
......@@ -207,8 +207,8 @@ bool UniSetObject::receiveMessage( VoidMessage& vm )
// контроль переполнения
if( queueMsg.size() > SizeOfMessageQueue )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname <<"(receiveMessages): messages queue overflow!" << endl << flush;
if( ulog.is_crit() )
ulog.crit() << myname <<"(receiveMessages): messages queue overflow!" << endl << flush;
cleanMsgQueue(queueMsg);
// обновляем статистику по переполнениям
stCountOfQueueFull++;
......@@ -217,8 +217,8 @@ bool UniSetObject::receiveMessage( VoidMessage& vm )
if( !queueMsg.empty() )
{
// if( unideb.debugging(Debug::CRIT) )
// unideb[Debug::CRIT] << myname <<"(receiveMessages): get new msg.." << endl << flush;
// if( ulog.is_crit() )
// ulog.crit() << myname <<"(receiveMessages): get new msg.." << endl << flush;
vm = queueMsg.top(); // получили сообщение
// Проверка на последовательное вынимание
......@@ -327,19 +327,19 @@ bool UniSetObject::waitMessage(VoidMessage& vm, timeout_t timeMS)
// ------------------------------------------------------------------------------------------
void UniSetObject::registered()
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": registration..." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": registration..." << endl;
if( myid == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(registered): myid=DefaultObjectId \n";
if( ulog.is_info() )
ulog.info() << myname << "(registered): myid=DefaultObjectId \n";
return;
}
if( !mymngr )
{
unideb[Debug::WARN] << myname << "(registered): unknown my manager" << endl;
ulog.warn() << myname << "(registered): unknown my manager" << endl;
string err(myname+": unknown my manager");
throw ORepFailed(err.c_str());
}
......@@ -348,7 +348,7 @@ void UniSetObject::registered()
UniSetTypes::uniset_rwmutex_rlock lock(refmutex);
if( !oref )
{
unideb[Debug::CRIT] << myname << "(registered): oref is NULL!..." << endl;
ulog.crit() << myname << "(registered): oref is NULL!..." << endl;
return;
}
}
......@@ -375,10 +375,10 @@ void UniSetObject::registered()
объект станет недоступен другим, а знать об этом не будет!!!
*/
unideb[Debug::CRIT] << myname << "(registered): replace object (ObjectNameAlready)" << endl;
ulog.crit() << myname << "(registered): replace object (ObjectNameAlready)" << endl;
reg = true;
unregister();
// unideb[Debug::CRIT] << myname << "(registered): не смог зарегестрироваться в репозитории объектов (ObjectNameAlready)" << endl;
// ulog.crit() << myname << "(registered): не смог зарегестрироваться в репозитории объектов (ObjectNameAlready)" << endl;
// throw al;
}
}
......@@ -390,7 +390,7 @@ void UniSetObject::registered()
}
catch(Exception& ex)
{
unideb[Debug::WARN] << myname << "(registered): " << ex << endl;
ulog.warn() << myname << "(registered): " << ex << endl;
string err(myname+": don`t registration in object reposotory");
throw ORepFailed(err.c_str());
}
......@@ -404,8 +404,8 @@ void UniSetObject::unregister()
if( myid == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << "(unregister): myid=DefaultObjectId \n";
if( ulog.is_info() )
ulog.info() << myname << "(unregister): myid=DefaultObjectId \n";
reg = false;
return;
}
......@@ -414,7 +414,7 @@ void UniSetObject::unregister()
UniSetTypes::uniset_rwmutex_rlock lock(refmutex);
if( !oref )
{
unideb[Debug::WARN] << myname << "(unregister): oref NULL!" << endl;
ulog.warn() << myname << "(unregister): oref NULL!" << endl;
reg = false;
return;
}
......@@ -423,17 +423,17 @@ void UniSetObject::unregister()
try
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": unregister "<< endl;
if( ulog.is_info() )
ulog.info() << myname << ": unregister "<< endl;
ui.unregister(myid);
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": unregister ok. "<< endl;
if( ulog.is_info() )
ulog.info() << myname << ": unregister ok. "<< endl;
}
catch(...)
{
unideb[Debug::WARN] << myname << ": don`t registration in object repository" << endl;
ulog.warn() << myname << ": don`t registration in object repository" << endl;
}
reg = false;
......@@ -463,8 +463,8 @@ void UniSetObject::push(const TransportMessage& tm)
// контроль переполнения
if( !queueMsg.empty() && queueMsg.size()>SizeOfMessageQueue )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname <<"(push): message queue overflow!" << endl << flush;
if( ulog.is_crit() )
ulog.crit() << myname <<"(push): message queue overflow!" << endl << flush;
cleanMsgQueue(queueMsg);
// обновляем статистику
......@@ -472,8 +472,8 @@ void UniSetObject::push(const TransportMessage& tm)
stMaxQueueMessages=0;
}
// if( unideb.debugging(Debug::CRIT) )
// unideb[Debug::CRIT] << myname <<"(push): push new msg.." << endl << flush;
// if( ulog.is_crit() )
// ulog.crit() << myname <<"(push): push new msg.." << endl << flush;
VoidMessage v(tm);
queueMsg.push(v);
......@@ -500,10 +500,10 @@ struct tmpConsumerInfo
void UniSetObject::cleanMsgQueue( MessagesQueue& q )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): msg queue cleaning..." << endl << flush;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): current size of queue: " << q.size() << endl << flush;
ulog.crit() << myname << "(cleanMsgQueue): msg queue cleaning..." << endl << flush;
ulog.crit() << myname << "(cleanMsgQueue): current size of queue: " << q.size() << endl << flush;
}
// проходим по всем известным нам типам(базовым)
......@@ -570,20 +570,20 @@ void UniSetObject::cleanMsgQueue( MessagesQueue& q )
}
}
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): ******** cleanup RESULT ********" << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(cleanMsgQueue): ******** cleanup RESULT ********" << endl;
for( map<UniSetTypes::ObjectId,tmpConsumerInfo>::iterator it0 = consumermap.begin();
it0!=consumermap.end(); ++it0 )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): CONSUMER=" << it0->first << endl;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): after clean SensorMessage: " << it0->second.smap.size() << endl;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): after clean TimerMessage: " << it0->second.tmap.size() << endl;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): after clean SystemMessage: " << it0->second.sysmap.size() << endl;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): after clean ConfirmMessage: " << it0->second.cmap.size() << endl;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): after clean other: " << it0->second.lstOther.size() << endl;
ulog.crit() << myname << "(cleanMsgQueue): CONSUMER=" << it0->first << endl;
ulog.crit() << myname << "(cleanMsgQueue): after clean SensorMessage: " << it0->second.smap.size() << endl;
ulog.crit() << myname << "(cleanMsgQueue): after clean TimerMessage: " << it0->second.tmap.size() << endl;
ulog.crit() << myname << "(cleanMsgQueue): after clean SystemMessage: " << it0->second.sysmap.size() << endl;
ulog.crit() << myname << "(cleanMsgQueue): after clean ConfirmMessage: " << it0->second.cmap.size() << endl;
ulog.crit() << myname << "(cleanMsgQueue): after clean other: " << it0->second.lstOther.size() << endl;
}
// теперь ОСТАВШИЕСЯ запихиваем обратно в очередь...
......@@ -616,9 +616,9 @@ void UniSetObject::cleanMsgQueue( MessagesQueue& q )
q.push(*it6);
}
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname
ulog.crit() << myname
<< "(cleanMsgQueue): ******* result size of queue: "
<< q.size()
<< " < " << getMaxSizeOfMessageQueue() << endl;
......@@ -626,10 +626,10 @@ void UniSetObject::cleanMsgQueue( MessagesQueue& q )
if( q.size() >= getMaxSizeOfMessageQueue() )
{
if( unideb.debugging(Debug::CRIT) )
if( ulog.is_crit() )
{
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): clean failed. size > " << q.size() << endl;
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): remove " << getMaxCountRemoveOfMessage() << " old messages " << endl;
ulog.crit() << myname << "(cleanMsgQueue): clean failed. size > " << q.size() << endl;
ulog.crit() << myname << "(cleanMsgQueue): remove " << getMaxCountRemoveOfMessage() << " old messages " << endl;
}
for( unsigned int i=0; i<getMaxCountRemoveOfMessage(); i++ )
{
......@@ -639,8 +639,8 @@ void UniSetObject::cleanMsgQueue( MessagesQueue& q )
break;
}
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(cleanMsgQueue): result size=" << q.size() << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(cleanMsgQueue): result size=" << q.size() << endl;
}
}
// ------------------------------------------------------------------------------------------
......@@ -676,8 +676,8 @@ bool UniSetObject::disactivate()
try
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "disactivateObject..." << endl;
if( ulog.is_info() )
ulog.info() << "disactivateObject..." << endl;
PortableServer::POA_var poamngr = mymngr->getPOA();
if( !PortableServer::POA_Helper::is_nil(poamngr) )
......@@ -690,37 +690,37 @@ bool UniSetObject::disactivate()
unregister();
PortableServer::ObjectId_var oid = poamngr->servant_to_id(static_cast<PortableServer::ServantBase*>(this));
poamngr->deactivate_object(oid);
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "ok..." << endl;
if( ulog.is_info() )
ulog.info() << "ok..." << endl;
return true;
}
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "manager already destroyed.." << endl;
if( ulog.is_warn() )
ulog.warn() << "manager already destroyed.." << endl;
}
catch(CORBA::TRANSIENT)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "isExist: нет связи..."<< endl;
if( ulog.is_warn() )
ulog.warn() << "isExist: нет связи..."<< endl;
}
catch( CORBA::SystemException& ex )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "UniSetObject: "<<"поймали CORBA::SystemException: " << ex.NP_minorString() << endl;
if( ulog.is_warn() )
ulog.warn() << "UniSetObject: "<<"поймали CORBA::SystemException: " << ex.NP_minorString() << endl;
}
catch(CORBA::Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "UniSetObject: "<<"поймали CORBA::Exception." << endl;
if( ulog.is_warn() )
ulog.warn() << "UniSetObject: "<<"поймали CORBA::Exception." << endl;
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "UniSetObject: "<< ex << endl;
if( ulog.is_warn() )
ulog.warn() << "UniSetObject: "<< ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "UniSetObject: "<<" catch ..." << endl;
if( ulog.is_warn() )
ulog.warn() << "UniSetObject: "<<" catch ..." << endl;
}
return false;
......@@ -729,12 +729,12 @@ bool UniSetObject::disactivate()
// ------------------------------------------------------------------------------------------
bool UniSetObject::activate()
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": activate..." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": activate..." << endl;
if( mymngr == NULL )
{
unideb[Debug::CRIT] << myname << "(activate): mymngr=NULL!!! activate failure..." << endl;
ulog.crit() << myname << "(activate): mymngr=NULL!!! activate failure..." << endl;
return false;
}
......@@ -756,7 +756,7 @@ bool UniSetObject::activate()
// то myname = noname. ВСЕГДА!
if( myid == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] << myname << "(activate): Не задан ID!!! activate failure..." << endl;
ulog.crit() << myname << "(activate): Не задан ID!!! activate failure..." << endl;
// вызываем на случай если она переопределена в дочерних классах
// Например в ObjectsManager, если здесь не вызвать, то не будут инициализированы подчинённые объекты.
// (см. ObjectsManager::activateObject)
......@@ -792,9 +792,9 @@ bool UniSetObject::activate()
}
else
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << myname << ": ?? не задан ObjectId...("
ulog.info() << myname << ": ?? не задан ObjectId...("
<< "myid=" << myid << " threadcreate=" << threadcreate
<< ")" << endl;
}
......@@ -802,22 +802,22 @@ bool UniSetObject::activate()
}
activateObject();
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": activate ok." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": activate ok." << endl;
return true;
}
// ------------------------------------------------------------------------------------------
void UniSetObject::work()
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": thread processing messages run..." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": thread processing messages run..." << endl;
if( thr )
msgpid = thr->getTID();
while( isActive() )
{
callback();
}
unideb[Debug::WARN] << myname << ": thread processing messages stop..." << endl;
ulog.warn() << myname << ": thread processing messages stop..." << endl;
}
// ------------------------------------------------------------------------------------------
void UniSetObject::callback()
......@@ -832,8 +832,8 @@ void UniSetObject::callback()
// ------------------------------------------------------------------------------------------
void UniSetObject::processingMessage( UniSetTypes::VoidMessage *msg )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname << ": default processing messages..." << endl;
if( ulog.is_info() )
ulog.info() << myname << ": default processing messages..." << endl;
}
// ------------------------------------------------------------------------------------------
UniSetTypes::SimpleInfo* UniSetObject::getInfo()
......
src/ObjectRepository/UniSetObject_LT.cc
View file @ dc1fabfe
......@@ -61,7 +61,7 @@ void UniSetObject_LT::callback()
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(callback): " << ex << endl;
ulog.crit() << myname << "(callback): " << ex << endl;
}
}
// ------------------------------------------------------------------------------------------
......
src/Processes/IOController.cc
View file @ dc1fabfe
......@@ -85,7 +85,7 @@ void IOController::sensorsUnregistration()
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(sensorsUnregistration): "<< ex << endl;
ulog.crit() << myname << "(sensorsUnregistration): "<< ex << endl;
}
catch(...){}
}
......@@ -118,8 +118,8 @@ long IOController::localGetValue( IOController::IOStateList::iterator& li,
err << myname << "(localGetValue): Not found sensor (" << si.id << ":" << si.node << ") "
<< conf->oind->getNameById(si.id);
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << err.str() << endl;
if( ulog.is_info() )
ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
......@@ -236,9 +236,9 @@ void IOController::localSetValue( IOController::IOStateList::iterator& li,
if( checkIOFilters(&li->second,value,sup_id) || blocked )
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << myname << ": save sensor value (" << si.id << ":" << si.node << ")"
ulog.info() << myname << ": save sensor value (" << si.id << ":" << si.node << ")"
<< " name: " << conf->oind->getNameById(si.id)
<< " node: " << conf->oind->getMapName(si.node)
<< " value="<< value << endl;
......@@ -295,7 +295,7 @@ IOType IOController::getIOType( const IOController_i::SensorInfo& si )
ostringstream err;
err << myname << "(getIOType): датчик имя: " << conf->oind->getNameById(si.id) << " не найден";
// unideb[Debug::INFO] << err.str() << endl;
// ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
// ---------------------------------------------------------------------------
......@@ -306,8 +306,8 @@ void IOController::ioRegistration( const USensorInfo& ainf, bool force )
{
ostringstream err;
err << "(IOCOntroller::ioRegistration): КОНТРОЛЛЕРУ НЕ ЗАДАН ObjectId. Регистрация невозможна.";
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << err.str() << endl;
if( ulog.is_warn() )
ulog.warn() << err.str() << endl;
throw ResolveNameError(err.str().c_str());
}
......@@ -348,9 +348,9 @@ void IOController::ioRegistration( const USensorInfo& ainf, bool force )
{
try
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << myname
ulog.info() << myname
<< "(ioRegistration): регистрирую "
<< conf->oind->getNameById(ainf.si.id, ainf.si.node) << endl;
}
......@@ -359,9 +359,9 @@ void IOController::ioRegistration( const USensorInfo& ainf, bool force )
}
catch(ObjectNameAlready& ex )
{
if( unideb.debugging(Debug::WARN) )
if( ulog.is_warn() )
{
unideb[Debug::WARN] << myname
ulog.warn() << myname
<< "(asRegistration): ЗАМЕНЯЮ СУЩЕСТВУЮЩИЙ ОБЪЕКТ (ObjectNameAlready)" << endl;
}
ui.unregister(ainf.si.id,ainf.si.node);
......@@ -370,13 +370,13 @@ void IOController::ioRegistration( const USensorInfo& ainf, bool force )
}
catch( Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(ioRegistration): " << ex << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(ioRegistration): " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(ioRegistration): catch ..."<< endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(ioRegistration): catch ..."<< endl;
}
}
// ---------------------------------------------------------------------------
......@@ -407,8 +407,8 @@ void IOController::logging( UniSetTypes::SensorMessage& sm )
if( isPingDBServer )
{
isPingDBServer = false;
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(logging): DBServer unavailable" << endl;
if( ulog.is_crit() )
ulog.crit() << myname << "(logging): DBServer unavailable" << endl;
}
}
}
......@@ -487,8 +487,8 @@ IOController_i::SensorIOInfo IOController::getSensorIOInfo( const IOController_i
err << myname << "(getSensorIOInfo): Unknown sensor (" << si.id << ":" << si.node << ")"
<< conf->oind->getNameById(si.id,si.node);
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << err.str() << endl;
if( ulog.is_info() )
ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
......@@ -532,8 +532,8 @@ void IOController::calibrate(const IOController_i::SensorInfo& si,
throw IOController_i::NameNotFound(err.str().c_str());
}
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << myname <<"(calibrate): from " << conf->oind->getNameById(adminId) << endl;
if( ulog.is_info() )
ulog.info() << myname <<"(calibrate): from " << conf->oind->getNameById(adminId) << endl;
it->second.ci = ci;
}
......@@ -704,8 +704,8 @@ IOController_i::ShortIOInfo IOController::getChangedTime( const IOController_i::
ostringstream err;
err << myname << "(getChangedTime): вход(выход) с именем "
<< conf->oind->getNameById(si.id) << " не найден";
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << err.str() << endl;
if( ulog.is_info() )
ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
// -----------------------------------------------------------------------------
......@@ -746,8 +746,8 @@ IOController::ChangeSignal IOController::signal_change_value( UniSetTypes::Objec
err << myname << "(signal_change_value): вход(выход) с именем "
<< conf->oind->getNameById(id) << " не найден";
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << err.str() << endl;
if( ulog.is_info() )
ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
......@@ -775,8 +775,8 @@ IOController::ChangeUndefinedStateSignal IOController::signal_change_undefined_s
err << myname << "(signal_change_undefine): вход(выход) с именем "
<< conf->oind->getNameById(id) << " не найден";
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << err.str() << endl;
if( ulog.is_info() )
ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
......
src/Processes/IONotifyController.cc
View file @ dc1fabfe
......@@ -134,7 +134,7 @@ bool IONotifyController::removeConsumer(ConsumerList& lst, const ConsumerInfo& c
if( li->id == cons.id && li->node == cons.node )
{
lst.erase(li);
// unideb[Debug::INFO] << name.c_name() <<": удаляем "<< name << " из списка потребителей" << endl;
// ulog.info() << name.c_name() <<": удаляем "<< name << " из списка потребителей" << endl;
return true;
}
}
......@@ -150,9 +150,9 @@ bool IONotifyController::removeConsumer(ConsumerList& lst, const ConsumerInfo& c
void IONotifyController::askSensor(const IOController_i::SensorInfo& si,
const UniSetTypes::ConsumerInfo& ci, UniversalIO::UIOCommand cmd )
{
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << "(askSensor): поступил " << ( cmd == UIODontNotify ? "отказ" :"заказ" ) << " от "
ulog.info() << "(askSensor): поступил " << ( cmd == UIODontNotify ? "отказ" :"заказ" ) << " от "
<< conf->oind->getNameById(ci.id, ci.node)
<< " на аналоговый датчик "
<< conf->oind->getNameById(si.id,si.node) << endl;
......@@ -196,20 +196,20 @@ void IONotifyController::askSensor(const IOController_i::SensorInfo& si,
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askSensor): " << conf->oind->getNameById(si.id, si.node) << " catch "<< ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askSensor): " << conf->oind->getNameById(si.id, si.node) << " catch "<< ex << endl;
}
catch( CORBA::SystemException& ex )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << conf->oind->getNameById(ci.id, ci.node)
if( ulog.is_warn() )
ulog.warn() << conf->oind->getNameById(ci.id, ci.node)
<< " недоступен!!(CORBA::SystemException): "
<< ex.NP_minorString() << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << conf->oind->getNameById(ci.id, ci.node)
if( ulog.is_warn() )
ulog.warn() << conf->oind->getNameById(ci.id, ci.node)
<< " catch..." << endl;
}
}
......@@ -242,13 +242,13 @@ void IONotifyController::ask(AskMap& askLst, const IOController_i::SensorInfo& s
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump: " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump: " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump (catch...)" << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump (catch...)" << endl;
}
}
else
......@@ -261,13 +261,13 @@ void IONotifyController::ask(AskMap& askLst, const IOController_i::SensorInfo& s
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump: " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump: " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump (catch...)" << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump (catch...)" << endl;
}
}
}
......@@ -290,13 +290,13 @@ void IONotifyController::ask(AskMap& askLst, const IOController_i::SensorInfo& s
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump: " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump: " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump (catch...)" << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump (catch...)" << endl;
}
}
}
......@@ -336,8 +336,9 @@ void IONotifyController::localSetValue( IOController::IOStateList::iterator& li,
err << myname << "(localSetValue): вход(выход) с именем "
<< conf->oind->getNameById(si.id) << " не найден";
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << err.str() << endl;
if( ulog.is_info() )
ulog.info() << err.str() << endl;
throw IOController_i::NameNotFound(err.str().c_str());
}
......@@ -415,21 +416,21 @@ void IONotifyController::send(ConsumerList& lst, UniSetTypes::SensorMessage& sm)
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(IONotifyController::send): " << ex
if( ulog.is_warn() )
ulog.warn() << myname << "(IONotifyController::send): " << ex
<< " for " << conf->oind->getNameById(li->id, li->node) << endl;
}
catch( CORBA::SystemException& ex )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(IONotifyController::send): "
if( ulog.is_warn() )
ulog.warn() << myname << "(IONotifyController::send): "
<< conf->oind->getNameById(li->id, li->node) << " (CORBA::SystemException): "
<< ex.NP_minorString() << endl;
}
catch(...)
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(IONotifyController::send): "
if( ulog.is_crit() )
ulog.crit() << myname << "(IONotifyController::send): "
<< conf->oind->getNameById(li->id, li->node)
<< " catch..." << endl;
}
......@@ -466,8 +467,8 @@ void IONotifyController::readDump()
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(IONotifyController::readDump): " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(IONotifyController::readDump): " << ex << endl;
}
}
// --------------------------------------------------------------------------------------------------------------
......@@ -486,8 +487,8 @@ void IONotifyController::dumpOrdersList(const IOController_i::SensorInfo& si,
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(IONotifyController::dumpOrderList): " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(IONotifyController::dumpOrderList): " << ex << endl;
}
}
// --------------------------------------------------------------------------------------------------------------
......@@ -506,8 +507,8 @@ void IONotifyController::dumpThresholdList(const IOController_i::SensorInfo& si,
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(IONotifyController::dumpThresholdList): " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(IONotifyController::dumpThresholdList): " << ex << endl;
}
}
// --------------------------------------------------------------------------------------------------------------
......@@ -554,13 +555,13 @@ void IONotifyController::askThreshold(const IOController_i::SensorInfo& si, cons
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump: " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump: " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << " не смогли сделать dump" << endl;
if( ulog.is_warn() )
ulog.warn() << myname << " не смогли сделать dump" << endl;
}
}
else
......@@ -573,13 +574,13 @@ void IONotifyController::askThreshold(const IOController_i::SensorInfo& si, cons
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshold): dump: " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshold): dump: " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshold): dump catch..." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshold): dump catch..." << endl;
}
}
}
......@@ -624,19 +625,19 @@ void IONotifyController::askThreshold(const IOController_i::SensorInfo& si, cons
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshod): " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshod): " << ex << endl;
}
catch( CORBA::SystemException& ex )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshod): CORBA::SystemException: "
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshod): CORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshold): dump catch..." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshold): dump catch..." << endl;
}
}
break;
......@@ -653,13 +654,13 @@ void IONotifyController::askThreshold(const IOController_i::SensorInfo& si, cons
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshold): dump: " << ex << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshold): dump: " << ex << endl;
}
catch(...)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(askThreshold): dump catch..." << endl;
if( ulog.is_warn() )
ulog.warn() << myname << "(askThreshold): dump catch..." << endl;
}
}
}
......@@ -796,8 +797,8 @@ void IONotifyController::checkThreshold( IOStateList::iterator& li,
}
catch( UniSetTypes::Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(checkThreshold): "
if( ulog.is_crit() )
ulog.crit() << myname << "(checkThreshold): "
<< ex << endl;
}
}
......@@ -835,8 +836,8 @@ void IONotifyController::checkThreshold( IOStateList::iterator& li,
}
catch( UniSetTypes::Exception& ex )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(checkThreshold): "
if( ulog.is_crit() )
ulog.crit() << myname << "(checkThreshold): "
<< ex << endl;
}
}
......@@ -875,7 +876,7 @@ IONotifyController::ThresholdExtList::iterator IONotifyController::findThreshold
// --------------------------------------------------------------------------------------------------------------
IONotifyController_i::ThresholdsListSeq* IONotifyController::getThresholdsList()
{
// unideb[Debug::INFO] << myname << "(getThresholdsList): ...\n";
// ulog.info() << myname << "(getThresholdsList): ...\n";
IONotifyController_i::ThresholdsListSeq* res = new IONotifyController_i::ThresholdsListSeq();
......@@ -894,8 +895,8 @@ IONotifyController_i::ThresholdsListSeq* IONotifyController::getThresholdsList()
}
catch(Exception& ex)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << myname << "(getThresholdsList): для датчика "
if( ulog.is_warn() )
ulog.warn() << myname << "(getThresholdsList): для датчика "
<< conf->oind->getNameById(it->second.si.id, it->second.si.node)
<< " " << ex << endl;
continue;
......
src/Processes/IONotifyController_LT.cc
View file @ dc1fabfe
......@@ -62,7 +62,7 @@ void IONotifyController_LT::callback()
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << myname << "(callback): " << ex << endl;
ulog.crit() << myname << "(callback): " << ex << endl;
}
}
// ------------------------------------------------------------------------------------------
......
src/Processes/NCRestorer.cc
View file @ dc1fabfe
......@@ -65,7 +65,7 @@ void NCRestorer::addlist( IONotifyController* ic, SInfo& inf, IONotifyController
break;
default:
unideb[Debug::CRIT] << ic->getName() << "(askDumper::addlist): НЕИЗВЕСТНЫЙ ТИП ДАТЧИКА! -> "
ulog.crit() << ic->getName() << "(askDumper::addlist): НЕИЗВЕСТНЫЙ ТИП ДАТЧИКА! -> "
<< conf->oind->getNameById(inf.si.id,inf.si.node) << endl;
return;
break;
......@@ -84,7 +84,7 @@ void NCRestorer::addlist( IONotifyController* ic, SInfo& inf, IONotifyController
break;
default:
unideb[Debug::CRIT] << ic->getName() << "(askDumper::addlist): НЕИЗВЕСТНЫЙ ТИП ДАТЧИКА!-> "
ulog.crit() << ic->getName() << "(askDumper::addlist): НЕИЗВЕСТНЫЙ ТИП ДАТЧИКА!-> "
<< conf->oind->getNameById(inf.si.id,inf.si.node) << endl;
break;
}
......@@ -150,13 +150,13 @@ void NCRestorer::addthresholdlist( IONotifyController* ic, SInfo& inf, IONotifyC
}
catch(Exception& ex)
{
unideb[Debug::WARN] << ic->getName() << "(NCRestorer::addthresholdlist): " << ex
ulog.warn() << ic->getName() << "(NCRestorer::addthresholdlist): " << ex
<< " для " << conf->oind->getNameById(inf.si.id, inf.si.node) << endl;
throw;
}
catch( CORBA::SystemException& ex )
{
unideb[Debug::WARN] << ic->getName() << "(NCRestorer::addthresholdlist): "
ulog.warn() << ic->getName() << "(NCRestorer::addthresholdlist): "
<< conf->oind->getNameById(inf.si.id,inf.si.node) << " недоступен!!(CORBA::SystemException): "
<< ex.NP_minorString() << endl;
throw;
......@@ -191,8 +191,8 @@ void NCRestorer::init_depends_signals( IONotifyController* ic )
if( it->second.d_si.id == DefaultObjectId )
continue;
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << ic->getName() << "(NCRestorer::init_depends_signals): "
if( ulog.is_info() )
ulog.info() << ic->getName() << "(NCRestorer::init_depends_signals): "
<< " init depend: '" << conf->oind->getMapName(it->second.si.id) << "'"
<< " dep_name=(" << it->second.d_si.id << ")'" << conf->oind->getMapName(it->second.d_si.id) << "'"
<< endl;
......
src/Processes/NCRestorer_XML.cc
View file @ dc1fabfe
......@@ -82,22 +82,22 @@ void NCRestorer_XML::init( const std::string& fname )
}
catch(UniSetTypes::NameNotFound& ex)
{
unideb[Debug::WARN] << "(NCRestorer_XML): файл " << fname << " не найден, создаём новый...\n";
ulog.warn() << "(NCRestorer_XML): файл " << fname << " не найден, создаём новый...\n";
}
}
// ------------------------------------------------------------------------------------------
void NCRestorer_XML::dump(IONotifyController* ic, SInfo& inf,
const IONotifyController::ConsumerList& lst)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "NCRestorer_XML::dump NOT SUPPORT!!!!" << endl;
if( ulog.is_warn() )
ulog.warn() << "NCRestorer_XML::dump NOT SUPPORT!!!!" << endl;
}
// ------------------------------------------------------------------------------------------
void NCRestorer_XML::dumpThreshold(IONotifyController* ic, SInfo& inf,
const IONotifyController::ThresholdExtList& lst)
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "NCRestorer_XML::dumpThreshold NOT SUPPORT!!!!" << endl;
if( ulog.is_warn() )
ulog.warn() << "NCRestorer_XML::dumpThreshold NOT SUPPORT!!!!" << endl;
}
// ------------------------------------------------------------------------------------------
void NCRestorer_XML::read_list( UniXML& xml, xmlNode* node, IONotifyController* ic )
......@@ -115,7 +115,7 @@ void NCRestorer_XML::read_list( UniXML& xml, xmlNode* node, IONotifyController*
if( !getSensorInfo(xml,it,inf) )
{
unideb[Debug::WARN] << ic->getName() << "(read_list): не смог получить информацию по датчику " << endl;
ulog.warn() << ic->getName() << "(read_list): не смог получить информацию по датчику " << endl;
continue;
}
......@@ -139,7 +139,7 @@ void NCRestorer_XML::read_list( UniXML& xml, xmlNode* node, IONotifyController*
}
catch(Exception& ex)
{
unideb[Debug::WARN] << "(read_list): " << ex << endl;
ulog.warn() << "(read_list): " << ex << endl;
}
}
break;
......@@ -211,8 +211,8 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens
string sname( xml.getProp(it,"name"));
if( sname.empty() )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "(getBaseInfo): не указано имя датчика... пропускаем..." << endl;
if( ulog.is_warn() )
ulog.warn() << "(getBaseInfo): не указано имя датчика... пропускаем..." << endl;
return false;
}
......@@ -227,8 +227,8 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens
if( sid == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(getBaseInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР датчика --> " << sname << endl;
if( ulog.is_crit() )
ulog.crit() << "(getBaseInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР датчика --> " << sname << endl;
return false;
}
......@@ -239,8 +239,8 @@ bool NCRestorer_XML::getBaseInfo( UniXML& xml, xmlNode* it, IOController_i::Sens
if( snode == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(getBaseInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР узла --> " << snodename << endl;
if( ulog.is_crit() )
ulog.crit() << "(getBaseInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР узла --> " << snodename << endl;
return false;
}
......@@ -267,9 +267,9 @@ bool NCRestorer_XML::getSensorInfo( UniXML& xml, xmlNode* it, SInfo& inf )
else
{
inf.priority = Message::Medium;
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << "(NCRestorer_XML:getSensorInfo): не указан приоритет для "
ulog.info() << "(NCRestorer_XML:getSensorInfo): не указан приоритет для "
<< xml.getProp(it,"name") << endl;
}
}
......@@ -277,7 +277,7 @@ bool NCRestorer_XML::getSensorInfo( UniXML& xml, xmlNode* it, SInfo& inf )
inf.type = UniSetTypes::getIOType(xml.getProp(it,"iotype"));
if( inf.type == UniversalIO::UnknownIOType )
{
unideb[Debug::CRIT] << "(NCRestorer_XML:getSensorInfo): unknown iotype=" << xml.getProp(it,"iotype")
ulog.crit() << "(NCRestorer_XML:getSensorInfo): unknown iotype=" << xml.getProp(it,"iotype")
<< " for " << xml.getProp(it,"name") << endl;
return false;
}
......@@ -314,8 +314,8 @@ bool NCRestorer_XML::getSensorInfo( UniXML& xml, xmlNode* it, SInfo& inf )
inf.d_si.id = conf->getSensorID(d_txt);
if( inf.d_si.id == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(NCRestorer_XML:getSensorInfo): sensor='"
if( ulog.is_crit() )
ulog.crit() << "(NCRestorer_XML:getSensorInfo): sensor='"
<< xml.getProp(it,"name") << "' err: "
<< " Unknown SensorID for depend='" << d_txt
<< endl;
......@@ -346,14 +346,14 @@ void NCRestorer_XML::read_thresholds(UniXML& xml, xmlNode* node, IONotifyControl
NCRestorer_XML::SInfo inf;
if( !getSensorInfo(xml,it.getCurrent(),inf) )
{
unideb[Debug::WARN] << ic->getName()
ulog.warn() << ic->getName()
<< "(read_thresholds): не смог получить информацию по датчику" << endl;
continue;
}
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << ic->getName() << "(read_thresholds): "
ulog.info() << ic->getName() << "(read_thresholds): "
<< it.getProp("name") << endl;
// conf->oind->getNameById(inf.si.id,inf.si.node) << endl;
}
......@@ -368,16 +368,16 @@ void NCRestorer_XML::read_thresholds(UniXML& xml, xmlNode* node, IONotifyControl
IONotifyController::ThresholdInfoExt ti(0,0,0,0);
if( !getThresholdInfo(xml,tit,ti) )
{
unideb[Debug::WARN] << ic->getName()
ulog.warn() << ic->getName()
<< "(read_thresholds): не смог получить информацию о пороге"
<< " для датчика "
<< conf->oind->getNameById(inf.si.id,inf.si.node) << endl;
continue;
}
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << "(read_thresholds): \tthreshold low="
ulog.info() << "(read_thresholds): \tthreshold low="
<< ti.lowlimit << " \thi=" << ti.hilimit
<< " \t sb=" << ti.sensibility
<< " \t sid=" << ti.sid
......@@ -393,7 +393,7 @@ void NCRestorer_XML::read_thresholds(UniXML& xml, xmlNode* node, IONotifyControl
{
if( !getConsumerList(xml,ask_it,ti.clst) )
{
unideb[Debug::WARN] << ic->getName()
ulog.warn() << ic->getName()
<< "(read_thresholds): не смог получить список заказчиков"
<< " для порога " << ti.id
<< " датчика " << conf->oind->getNameById(inf.si.id,inf.si.node) << endl;
......@@ -462,7 +462,7 @@ bool NCRestorer_XML::getThresholdInfo( UniXML& xml,xmlNode* node,
ti.sid = conf->getSensorID(sid_name);
if( ti.sid == UniSetTypes::DefaultObjectId )
{
unideb[Debug::CRIT] << "(NCRestorer_XML:getThresholdInfo): "
ulog.crit() << "(NCRestorer_XML:getThresholdInfo): "
<< " Not found ID for " << sid_name << endl;
}
else
......@@ -471,7 +471,7 @@ bool NCRestorer_XML::getThresholdInfo( UniXML& xml,xmlNode* node,
// Пока что IONotifyController поддерживает работу только с 'DI'.
if( iotype != UniversalIO::DI )
{
unideb[Debug::CRIT] << "(NCRestorer_XML:getThresholdInfo): "
ulog.crit() << "(NCRestorer_XML:getThresholdInfo): "
<< " Bad iotype(" << iotype << ") for " << sid_name << ". iotype must be 'DI'!" << endl;
return false;
}
......
src/Various/Configuration.cc
View file @ dc1fabfe
......@@ -68,13 +68,13 @@ ostream& UniSetTypes::Configuration::help(ostream& os)
print_help(os,25,"--transientIOR {1,0}","использовать генерируемые IOR(не постоянные). Переопределяет параметр в конфигурационном файле. Default=1\n");
return os << "\nПример использования:\t myUniSetProgram "
<< "--unideb-add-levels level1,info,system,warn --unideb-log-in-file myprogrpam.log\n\n";
<< "--ulog.dd-levels level1,info,system,warn --ulog.og-in-file myprogrpam.log\n\n";
}
// -------------------------------------------------------------------------
namespace UniSetTypes
{
DebugStream unideb;
DebugStream ulog;
Configuration *conf = 0;
Configuration::Configuration():
......@@ -87,7 +87,7 @@ Configuration::Configuration():
fileConfName(""),
heartbeat_msec(10000)
{
// unideb[Debug::CRIT] << " configuration FAILED!!!!!!!!!!!!!!!!!" << endl;
// ulog.crit()<< " configuration FAILED!!!!!!!!!!!!!!!!!" << endl;
// throw Exception();
}
......@@ -159,8 +159,8 @@ Configuration::Configuration( int argc, const char* const* argv, const string fi
void Configuration::initConfiguration( int argc, const char* const* argv )
{
// PassiveTimer pt(UniSetTimer::WaitUpTime);
if( unideb.debugging(Debug::SYSTEM) )
unideb[Debug::SYSTEM] << "*** configure from file: " << fileConfName << endl;
if( ulog.is_system() )
ulog.system() << "*** configure from file: " << fileConfName << endl;
char curdir[FILENAME_MAX];
getcwd(curdir,FILENAME_MAX);
......@@ -184,18 +184,17 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
{
if( !unixml.isOpen() )
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "Configuration: open from file " << fileConfName << endl;
if( ulog.is_info() )
ulog.info() << "(Configuration): open from file " << fileConfName << endl;
unixml.open(fileConfName);
}
}
catch(...)
{
unideb << " FAILED open configuration from " << fileConfName << endl;
ulog << "(Configuration): FAILED open configuration from " << fileConfName << endl;
throw;
}
// default value
heartbeat_msec = 5000;
......@@ -209,7 +208,8 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
UniXML_iterator it = unixml.findNode(unixml.getFirstNode(),"ObjectsMap");
if( it == NULL )
{
unideb[Debug::CRIT] << "(Configuration:init): not found <ObjectsMap> node in " << fileConfName << endl;
if( ulog.is_crit() )
ulog.crit()<< "(Configuration:init): not found <ObjectsMap> node in " << fileConfName << endl;
throw SystemError("(Configuration:init): not found <ObjectsMap> node in " + fileConfName );
}
......@@ -222,14 +222,15 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
}
catch(Exception& ex )
{
unideb[Debug::CRIT] << "(Configuration:init): INIT FAILED! from " << fileConfName << endl;
if( ulog.is_crit() )
ulog.crit()<< "(Configuration:init): INIT FAILED! from " << fileConfName << endl;
throw;
}
}
}
// Настраиваем отладочные логи
initDebug(unideb, "UniSetDebug");
initDebug(ulog,"UniSetDebug");
// cerr << "*************** initConfiguration: oind: " << pt.getCurrent() << " msec " << endl;
// pt.reset();
......@@ -265,9 +266,6 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
if( imagesDir[0]!='/' && imagesDir[0]!='.' )
imagesDir = dataDir + imagesDir + "/";
// cerr << "*************** initConfiguration: parameters...: " << pt.getCurrent() << " msec " << endl;
// pt.reset();
// считываем список узлов
createNodesList();
......@@ -297,8 +295,8 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
param << "=corbaname::" << it->host << ":" << it->port;
new_argv[i+1] = strdup(param.str().c_str());
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "(Configuration): внесли параметр " << param.str() << endl;
if( ulog.is_info() )
ulog.info() << "(Configuration): внесли параметр " << param.str() << endl;
i+=2;
ostringstream uri;
......@@ -317,7 +315,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
xmlNode* nsnode = getNode("NameService");
if( !nsnode )
{
unideb[Debug::WARN] << "(Configuration): не нашли раздела 'NameService' \n";
ulog.warn() << "(Configuration): не нашли раздела 'NameService' \n";
new_argv[i] = "";
new_argv[i+1] = "";
}
......@@ -331,8 +329,8 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
ostringstream param;
param << this << "NameService=corbaname::" << getProp(nsnode,"host") << ":" << defPort;
new_argv[i+1] = strdup(param.str().c_str());
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "(Configuration): внесли параметр " << param.str() << endl;
if( ulog.is_info() )
ulog.info() << "(Configuration): внесли параметр " << param.str() << endl;
{
ostringstream ns_name;
......@@ -376,12 +374,12 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
}
catch( Exception& ex )
{
unideb[Debug::CRIT] << "Configuration:" << ex << endl;
ulog.crit()<< "Configuration:" << ex << endl;
throw;
}
catch(...)
{
unideb[Debug::CRIT] << "Configuration: INIT FAILED!!!!"<< endl;
ulog.crit()<< "Configuration: INIT FAILED!!!!"<< endl;
throw Exception("Configuration: INIT FAILED!!!!");
}
......@@ -419,24 +417,21 @@ int Configuration::getArgPInt( const string name, const string strdefval, int de
// -------------------------------------------------------------------------
// ????????????? ????????... (??? ???????????)
// WARNING: ??????? ??????? ?? ?????????????????? ???????? ? ????. ?????!!!
// ????????: ???? LocalNode ????? ????? LocalXXXServer, ?? ?????????????? ?? ????? ???????!!!
// ?.?. ?? ????? ??? ???????? LocalNode id.
// ???? ?????????? ??????? ?? ??????????? ????????????.
void Configuration::initParameters()
{
xmlNode* root = unixml.findNode( unixml.getFirstNode(),"UniSet" );
if( !root )
{
unideb[Debug::CRIT] << "Configuration: INIT PARAM`s FAILED! <UniSet>...</UniSet> not found"<< endl;
if( ulog.is_crit() )
ulog.crit()<< "Configuration: INIT PARAM`s FAILED! <UniSet>...</UniSet> not found"<< endl;
throw Exception("Configuration: INIT PARAM`s FAILED! <UniSet>...</UniSet> not found!");
}
UniXML_iterator it(root);
if( !it.goChildren() )
{
unideb[Debug::CRIT] << "Configuration: INIT PARAM`s FAILED!!!!"<< endl;
if( ulog.is_crit() )
ulog.crit()<< "Configuration: INIT PARAM`s FAILED!!!!"<< endl;
throw Exception("Configuration: INIT PARAM`s FAILED!!!!");
}
......@@ -461,8 +456,9 @@ void Configuration::initParameters()
if( localDBServer == DefaultObjectId )
{
ostringstream msg;
msg << "Configuration: DBServer '" << secDB << "' ?? ?????? ????????????? ÷ ObjectsMap!!!";
unideb[Debug::CRIT] << msg.str() << endl;
msg << "Configuration: DBServer '" << secDB << "' not found ServiceID in <services>!";
if( ulog.is_crit() )
ulog.crit()<< msg.str() << endl;
throw Exception(msg.str());
}
}
......@@ -538,7 +534,8 @@ void Configuration::setLocalNode( string nodename )
{
stringstream err;
err << "(Configuration::setLocalNode): Not found node '" << nodename << "'";
unideb[Debug::CRIT] << err.str() << endl;
if( ulog.is_crit() )
ulog.crit()<< err.str() << endl;
throw Exception(err.str());
}
......@@ -605,7 +602,8 @@ void Configuration::createNodesList()
xmlNode* omapnode = unixml.findNode(unixml.getFirstNode(), "ObjectsMap");
if( !omapnode )
{
unideb[Debug::CRIT] << "(Configuration): <ObjectsMap> not found!!!" << endl;
if( ulog.is_crit() )
ulog.crit()<< "(Configuration): <ObjectsMap> not found!!!" << endl;
throw Exception("(Configuration): <ObjectsMap> not found!");
}
......@@ -613,7 +611,8 @@ void Configuration::createNodesList()
xmlNode* node = unixml.findNode(omapnode, "nodes");
if(!node)
{
unideb[Debug::CRIT] << "(Configuration): <nodes> section not found!"<< endl;
if( ulog.is_crit() )
ulog.crit()<< "(Configuration): <nodes> section not found!"<< endl;
throw Exception("(Configiuration): <nodes> section not found");
}
......@@ -629,9 +628,9 @@ void Configuration::createNodesList()
string sname(getProp(it,"name"));
if(sname.empty())
{
unideb[Debug::CRIT] << "Configuration(createNodesList): unknown name='' in <nodes> "<< endl;
if( ulog.is_crit() )
ulog.crit()<< "Configuration(createNodesList): unknown name='' in <nodes> "<< endl;
throw Exception("Configuration(createNodesList: unknown name='' in <nodes>");
// continue;
}
string nodename(sname);
......@@ -640,13 +639,13 @@ void Configuration::createNodesList()
nodename = oind->mkFullNodeName(nodename,nodename);
NodeInfo ninf;
// unideb[Debug::INFO] << "Configuration(createNodesList): вносим узел " << nodename << endl;
// ulog.info() << "Configuration(createNodesList): вносим узел " << nodename << endl;
ninf.id = oind->getIdByName(nodename);
if( ninf.id == DefaultObjectId )
{
unideb[Debug::CRIT] << "Configuration(createNodesList): Not found ID for node '" << nodename << "'" << endl;
if( ulog.is_crit() )
ulog.crit()<< "Configuration(createNodesList): Not found ID for node '" << nodename << "'" << endl;
throw Exception("Configuration(createNodesList): Not found ID for node '"+nodename+"'");
// continue;
}
ninf.host = getProp(it,"ip").c_str();
......@@ -666,7 +665,8 @@ void Configuration::createNodesList()
ninf.dbserver = oind->getIdByName(dname);
if( ninf.dbserver == DefaultObjectId )
{
unideb[Debug::CRIT] << "Configuration(createNodesList): Not found ID for DBServer name='" << dname << "'" << endl;
if( ulog.is_crit() )
ulog.crit()<< "Configuration(createNodesList): Not found ID for DBServer name='" << dname << "'" << endl;
throw Exception("Configuration(createNodesList: Not found ID for DBServer name='"+dname+"'");
}
}
......@@ -678,13 +678,13 @@ void Configuration::createNodesList()
initNode(ninf, it);
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "Configuration(createNodesList): add to list of nodes: node=" << nodename << " id=" << ninf.id << endl;
if( ulog.is_info() )
ulog.info() << "Configuration(createNodesList): add to list of nodes: node=" << nodename << " id=" << ninf.id << endl;
lnodes.push_back(ninf);
}
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "Configuration(createNodesList): size of node list " << lnodes.size() << endl;
if( ulog.is_info() )
ulog.info() << "Configuration(createNodesList): size of node list " << lnodes.size() << endl;
}
// -------------------------------------------------------------------------
void Configuration::initNode( UniSetTypes::NodeInfo& ninfo, UniXML_iterator& it )
......@@ -780,7 +780,8 @@ void Configuration::initRepSections()
{
ostringstream msg;
msg << "Configuration(initRepSections): Not found section <RootSection> in " << fileConfName;
unideb[Debug::CRIT] << msg.str() << endl;
if( ulog.is_crit() )
ulog.crit()<< msg.str() << endl;
throw SystemError(msg.str());
}
......@@ -798,7 +799,8 @@ string Configuration::getRepSectionName( const string sec, xmlNode* secnode )
{
ostringstream msg;
msg << "Configuration(initRepSections): Not found section '" << sec << "' in " << fileConfName;
unideb[Debug::CRIT] << msg.str() << endl;
if( ulog.is_crit() )
ulog.crit()<< msg.str() << endl;
throw SystemError(msg.str());
}
......@@ -838,7 +840,8 @@ void Configuration::setConfFileName( const string fn )
msg << "\n\n***** CRIT: Unknown configure file." << endl
<< " Use --confile filename " << endl
<< " OR define enviropment variable UNISET_CONFILE" << endl;
unideb[Debug::CRIT] << msg.str();
if( ulog.is_crit() )
ulog.crit()<< msg.str();
throw SystemError(msg.str());
}
}
......
src/Various/Debug.cc
View file @ dc1fabfe
......@@ -122,4 +122,4 @@ std::ostream& operator<<(std::ostream& os, Debug::type level )
}
//DebugStream unideb;
//DebugStream ulog;
src/Various/DebugStream.cc
View file @ dc1fabfe
// Created by Lars Gullik Bjnnes
// Copyright 1999 Lars Gullik Bjnnes (larsbj@lyx.org)
// Created by Lars Gullik Bj�nnes
// Copyright 1999 Lars Gullik Bj�nnes (larsbj@lyx.org)
// Released into the public domain.
// Primarily developed for use in the LyX Project http://www.lyx.org/
......@@ -17,7 +17,7 @@
//#include "DebugStream.h"
#include "Debug.h"
//Since the current C++ lib in egcs does not have a standard implementation
//�Since the current C++ lib in egcs does not have a standard implementation
// of basic_streambuf and basic_filebuf we don't have to include this
// header.
//#define MODERN_STL_STREAMS
......@@ -239,7 +239,7 @@ std::ostream & DebugStream::debug(Debug::type t)
if(dt & t)
{
if( show_datetime )
print_datetime(t);
printDateTime(t);
*this << "(" << std::setfill(' ') << std::setw(6) << t << "): "; // "):\t";
return *this;
}
......@@ -255,7 +255,7 @@ std::ostream& DebugStream::operator()(Debug::type t)
return nullstream;
}
//--------------------------------------------------------------------------
std::ostream& DebugStream::print_date(Debug::type t, char brk)
std::ostream& DebugStream::printDate(Debug::type t, char brk)
{
if(dt && t)
{
......@@ -269,7 +269,7 @@ std::ostream& DebugStream::print_date(Debug::type t, char brk)
return nullstream;
}
//--------------------------------------------------------------------------
std::ostream& DebugStream::print_time(Debug::type t, char brk)
std::ostream& DebugStream::printTime(Debug::type t, char brk)
{
if(dt && t)
{
......@@ -283,7 +283,7 @@ std::ostream& DebugStream::print_time(Debug::type t, char brk)
return nullstream;
}
//--------------------------------------------------------------------------
std::ostream& DebugStream::print_datetime(Debug::type t)
std::ostream& DebugStream::printDateTime(Debug::type t)
{
if(dt & t)
{
......
src/Various/LT_Object.cc
View file @ dc1fabfe
......@@ -112,7 +112,7 @@ timeout_t LT_Object::checkTimers( UniSetObject* obj )
}
catch(Exception& ex)
{
unideb[Debug::CRIT] << "(checkTimers): " << ex << endl;
ulog.crit() << "(checkTimers): " << ex << endl;
}
return sleepTime;
......@@ -125,7 +125,7 @@ timeout_t LT_Object::askTimer( UniSetTypes::TimerId timerid, timeout_t timeMS, c
{
if( timeMS < UniSetTimer::MinQuantityTime )
{
unideb[Debug::CRIT] << "(LT_askTimer): [мс] попытка заказть таймер со временем срабатыания "
ulog.crit() << "(LT_askTimer): [мс] попытка заказть таймер со временем срабатыания "
<< " меньше разрешённого " << UniSetTimer::MinQuantityTime << endl;
timeMS = UniSetTimer::MinQuantityTime;
}
......@@ -141,9 +141,9 @@ timeout_t LT_Object::askTimer( UniSetTypes::TimerId timerid, timeout_t timeMS, c
{
li->curTick = ticks;
li->tmr.setTiming(timeMS);
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << "(LT_askTimer): заказ на таймер(id="
ulog.info() << "(LT_askTimer): заказ на таймер(id="
<< timerid << ") " << timeMS << " [мс] уже есть..." << endl;
}
return sleepTime;
......@@ -156,13 +156,13 @@ timeout_t LT_Object::askTimer( UniSetTypes::TimerId timerid, timeout_t timeMS, c
newti.reset();
} // unlock
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "(LT_askTimer): поступил заказ на таймер(id="<< timerid << ") " << timeMS << " [мс]\n";
if( ulog.is_info() )
ulog.info() << "(LT_askTimer): поступил заказ на таймер(id="<< timerid << ") " << timeMS << " [мс]\n";
}
else // отказ (при timeMS == 0)
{
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "(LT_askTimer): поступил отказ по таймеру id="<< timerid << endl;
if( ulog.is_info() )
ulog.info() << "(LT_askTimer): поступил отказ по таймеру id="<< timerid << endl;
{ // lock
uniset_rwmutex_wrlock lock(lstMutex);
tlst.remove_if(Timer_eq(timerid)); // STL - способ
......
src/Various/Mutex.cc
View file @ dc1fabfe
......@@ -112,10 +112,9 @@ uniset_mutex_lock::uniset_mutex_lock( uniset_mutex& m, int timeMS ):
mutex->mtx.lock();
if( !mutex->cnd->timedwait(sec, msec) )
{
if( !mutex->name().empty() && unideb.debugging( Debug::type(Debug::LEVEL9|Debug::WARN)) )
if( !mutex->name().empty() && ulog.is_level9() )
{
unideb[Debug::type(Debug::LEVEL9|Debug::WARN)]
<< "(mutex_lock): вышло заданное время ожидания "
ulog.level9() << "(mutex_lock): вышло заданное время ожидания "
<< timeMS << " msec для " << mutex->name() << endl;
}
......
src/Various/Restorer_XML.cc
View file @ dc1fabfe
......@@ -65,8 +65,8 @@ bool Restorer_XML::getConsumerInfo( UniXML_iterator& it,
string cname( it.getProp("name"));
if( cname.empty() )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "(Restorer_XML:getConsumerInfo): не указано имя заказчика..." << endl;
if( ulog.is_warn() )
ulog.warn() << "(Restorer_XML:getConsumerInfo): не указано имя заказчика..." << endl;
return false;
}
......@@ -79,9 +79,9 @@ bool Restorer_XML::getConsumerInfo( UniXML_iterator& it,
cname = conf->getServicesSection()+"/"+cname;
else
{
if( unideb.debugging(Debug::WARN) )
if( ulog.is_warn() )
{
unideb[Debug::WARN] << "(Restorer_XML:getConsumerInfo): неизвестный тип объекта "
ulog.warn() << "(Restorer_XML:getConsumerInfo): неизвестный тип объекта "
<< otype << endl;
}
return false;
......@@ -90,8 +90,8 @@ bool Restorer_XML::getConsumerInfo( UniXML_iterator& it,
cid = conf->oind->getIdByName(cname);
if( cid == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(Restorer_XML:getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР заказчика -->"
if( ulog.is_crit() )
ulog.crit() << "(Restorer_XML:getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР заказчика -->"
<< cname << endl;
return false;
}
......@@ -110,15 +110,15 @@ bool Restorer_XML::getConsumerInfo( UniXML_iterator& it,
if( cnode == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(Restorer_XML:getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР узла -->"
if( ulog.is_crit() )
ulog.crit() << "(Restorer_XML:getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР узла -->"
<< cnodename << endl;
return false;
}
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << "(Restorer_XML:getConsumerInfo): "
ulog.info() << "(Restorer_XML:getConsumerInfo): "
<< cname << ":" << cnodename << endl;
}
return true;
......@@ -130,8 +130,8 @@ bool Restorer_XML::old_getConsumerInfo( UniXML_iterator& it,
string cname(it.getProp("name"));
if( cname.empty() )
{
if( unideb.debugging(Debug::WARN) )
unideb[Debug::WARN] << "(Restorer_XML:old_getConsumerInfo): не указано имя заказчика... пропускаем..." << endl;
if( ulog.is_warn() )
ulog.warn() << "(Restorer_XML:old_getConsumerInfo): не указано имя заказчика... пропускаем..." << endl;
return false;
}
......@@ -139,8 +139,8 @@ bool Restorer_XML::old_getConsumerInfo( UniXML_iterator& it,
cid = conf->oind->getIdByName(cname);
if( cid == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(Restorer_XML:old_getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР заказчика -->"
if( ulog.is_crit() )
ulog.crit() << "(Restorer_XML:old_getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР заказчика -->"
<< cname << endl;
return false;
}
......@@ -159,15 +159,15 @@ bool Restorer_XML::old_getConsumerInfo( UniXML_iterator& it,
if( cnode == UniSetTypes::DefaultObjectId )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << "(Restorer_XML:old_getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР узла -->"
if( ulog.is_crit() )
ulog.crit() << "(Restorer_XML:old_getConsumerInfo): НЕ НАЙДЕН ИДЕНТИФИКАТОР узла -->"
<< cnodename << endl;
return false;
}
if( unideb.debugging(Debug::INFO) )
if( ulog.is_info() )
{
unideb[Debug::INFO] << "(Restorer_XML:old_getConsumerInfo): "
ulog.info() << "(Restorer_XML:old_getConsumerInfo): "
<< cname << ":" << cnodename << endl;
}
return true;
......
src/Various/RunLock.cc
View file @ dc1fabfe
......@@ -71,8 +71,8 @@ bool RunLock::isLocked(const string& name)
}
}
*/
if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "(RunLock): programm " << name << " already run" << endl;
if( ulog.is_info() )
ulog.info() << "(RunLock): programm " << name << " already run" << endl;
fclose(out);
closedir(d);
......
src/Various/UniXML.cc
View file @ dc1fabfe
......@@ -60,7 +60,7 @@ UniXML::UniXML():
UniXML::~UniXML()
{
//unideb << "UniXML destr" << endl;
//ulog.< "UniXML destr" << endl;
close();
}
......
tests/Makefile.am
View file @ dc1fabfe
......@@ -2,7 +2,7 @@
# This file is part of the UniSet library #
############################################################################
noinst_PROGRAMS = passivetimer hourglass delaytimer unixml ui umutex conftest iterator_test sscanf_hex calibration threadtst
noinst_PROGRAMS = passivetimer hourglass delaytimer unixml ui umutex conftest iterator_test sscanf_hex calibration threadtst dlog
passivetimer_SOURCES = passivetimer.cc
passivetimer_LDADD = $(top_builddir)/lib/libUniSet.la
......@@ -46,6 +46,10 @@ threadtst_SOURCES = threadtst.cc
threadtst_LDADD = $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS)
threadtst_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
dlog_SOURCES = dlog.cc
dlog_LDADD = $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS)
dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
include $(top_builddir)/conf/setting.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment