Skip to content

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

(LogServer): реализовал поддержку режима чтения только указанных(regexp) логов..…

(LogServer): реализовал поддержку режима чтения только указанных(regexp) логов.. (thank`s за идею hd@nio14) (UniSetTypes): небольшая оптимизация.. (uniset-log): переделал работу с аргументами командной строки (LogServer): сделал для вывода списка возможность задать фильтр..(т.е. выводиться не полный список) И другие мелкие правки: make style
parent de16881f
Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 330 deletions
Utilities/Admin/admin.cc
View file @ 7e0114b5
......@@ -128,7 +128,7 @@ static bool quiet = false;
int main(int argc, char** argv)
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
try
{
......
Utilities/MBTester/mbrtuslave.cc
View file @ 7e0114b5
......@@ -36,7 +36,7 @@ static char* checkArg( int ind, int argc, char* argv[] );
// --------------------------------------------------------------------------
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
int optindex = 0;
int opt = 0;
int verb = 0;
......
Utilities/MBTester/mbrtutester.cc
View file @ 7e0114b5
......@@ -97,7 +97,7 @@ static char* checkArg( int ind, int argc, char* argv[] );
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
Command cmd = cmdNOP;
int optindex = 0;
int opt = 0;
......
Utilities/MBTester/mbslave.cc
View file @ 7e0114b5
......@@ -33,7 +33,7 @@ static void print_help()
// --------------------------------------------------------------------------
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
int optindex = 0;
int opt = 0;
int verb = 0;
......
Utilities/MBTester/mbtcpserver.cc
View file @ 7e0114b5
......@@ -34,7 +34,7 @@ static void print_help()
// --------------------------------------------------------------------------
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
int optindex = 0;
int opt = 0;
int verb = 0;
......
Utilities/MBTester/mbtcptester.cc
View file @ 7e0114b5
......@@ -83,7 +83,7 @@ static char* checkArg( int ind, int argc, char* argv[] );
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
Command cmd = cmdNOP;
int optindex = 0;
int opt = 0;
......
Utilities/NullController/main.cc
View file @ 7e0114b5
......@@ -21,7 +21,7 @@ static void short_usage()
// --------------------------------------------------------------------------
int main(int argc, char** argv)
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
try
{
......
Utilities/SImitator/main.cc
View file @ 7e0114b5
......@@ -25,7 +25,7 @@ struct ExtInfo:
// -----------------------------------------------------------------------------
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
try
{
......
Utilities/SMonit/smonitor.cc
View file @ 7e0114b5
......@@ -9,7 +9,7 @@ using namespace std;
// -----------------------------------------------------------------------------
int main( int argc, const char** argv )
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
try
{
......
Utilities/SViewer-text/main.cc
View file @ 7e0114b5
......@@ -13,7 +13,7 @@ static void short_usage()
// --------------------------------------------------------------------------
int main(int argc, const char** argv)
{
// std::ios::sync_with_stdio(false);
// std::ios::sync_with_stdio(false);
try
{
......
Utilities/ULog/log.cc
View file @ 7e0114b5
......@@ -14,6 +14,7 @@ static struct option longopts[] =
{
{ "help", no_argument, 0, 'h' },
{ "verbose", no_argument, 0, 'v' },
{ "filter", required_argument, 0, 'f' },
{ "iaddr", required_argument, 0, 'i' },
{ "port", required_argument, 0, 'p' },
{ "add", required_argument, 0, 'a' },
......@@ -21,9 +22,9 @@ static struct option longopts[] =
{ "set", required_argument, 0, 's' },
{ "off", required_argument, 0, 'o' },
{ "on", required_argument, 0, 'e' },
{ "list", no_argument, 0, 'l' },
{ "rotate", required_argument, 0, 'r' },
{ "logname", required_argument, 0, 'n' },
{ "list", optional_argument, 0, 'l' },
{ "rotate", optional_argument, 0, 'r' },
{ "logfilter", required_argument, 0, 'n' },
{ "command-only", no_argument, 0, 'b' },
{ "timeout", required_argument, 0, 'w' },
{ "reconnect-delay", required_argument, 0, 'x' },
......@@ -36,7 +37,6 @@ static void print_help()
printf("-v, --verbose - Print all messages to stdout\n");
printf("[-i|--iaddr] addr - LogServer ip or hostname.\n");
printf("[-p|--port] port - LogServer port.\n");
printf("[-n|--logname] name - Send command only for 'logname'.\n");
printf("[-b|--command-only] - Send command and break. (No read logs).\n");
printf("[-w|--timeout] msec - Timeout for wait data. Default: 0 - endless waiting\n");
printf("[-x|--reconnect-delay] msec - Pause for repeat connect to LogServer. Default: 5000 msec.\n");
......@@ -44,15 +44,20 @@ static void print_help()
printf("\n");
printf("Commands:\n");
printf("[--add | -a] info,warn,crit,... - Add log levels.\n");
printf("[--del | -d] info,warn,crit,... - Delete log levels.\n");
printf("[--set | -s] info,warn,crit,... - Set log levels.\n");
printf("--off, -o - Off the write log file (if enabled).\n");
printf("--on, -e - On(enable) the write log file (if before disabled).\n");
printf("--rotate, -r - rotate log file.\n");
printf("--list, -l - List of managed logs.\n");
printf("[--add | -a] info,warn,crit,... [logfilter] - Add log levels.\n");
printf("[--del | -d] info,warn,crit,... [logfilter] - Delete log levels.\n");
printf("[--set | -s] info,warn,crit,... [logfilter] - Set log levels.\n");
printf("--off, -o [logfilter] - Off the write log file (if enabled).\n");
printf("--on, -e [logfilter] - On(enable) the write log file (if before disabled).\n");
printf("--rotate, -r [logfilter] - rotate log file.\n");
printf("--list, -l [logfilter] - List of managed logs.\n");
printf("--filter, -f logfilter - ('filter mode'). View log only from 'logfilter'(regexp)\n");
printf("\n");
printf("Note: 'logfilter' - regexp for name of log. Default: ALL logs.\n");
}
// --------------------------------------------------------------------------
static char* checkArg( int i, int argc, char* argv[] );
// --------------------------------------------------------------------------
int main( int argc, char** argv )
{
// std::ios::sync_with_stdio(false); // нельзя отключать.. тогда "обмен с сервером" рассинхронизируется
......@@ -67,13 +72,13 @@ int main( int argc, char** argv )
int data = 0;
string sdata("");
int cmdonly = 0;
string logname("");
string logfilter("");
timeout_t tout = 0;
timeout_t rdelay = 5000;
try
{
while( (opt = getopt_long(argc, argv, "hvla:p:i:d:s:n:eorbx:w:", longopts, &optindex)) != -1 )
while( (opt = getopt_long(argc, argv, "hvlf:a:p:i:d:s:n:eorbx:w:", longopts, &optindex)) != -1 )
{
switch (opt)
{
......@@ -85,6 +90,12 @@ int main( int argc, char** argv )
{
cmd = LogServerTypes::cmdAddLevel;
sdata = string(optarg);
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
......@@ -92,6 +103,12 @@ int main( int argc, char** argv )
{
cmd = LogServerTypes::cmdDelLevel;
sdata = string(optarg);
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
......@@ -99,34 +116,75 @@ int main( int argc, char** argv )
{
cmd = LogServerTypes::cmdSetLevel;
sdata = string(optarg);
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
case 'l':
{
cmd = LogServerTypes::cmdList;
cmdonly = 1;
break;
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
case 'o':
{
cmd = LogServerTypes::cmdOffLogFile;
break;
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
case 'f':
{
cmd = LogServerTypes::cmdFilterMode;
logfilter = string(optarg);
}
break;
case 'e':
{
cmd = LogServerTypes::cmdOnLogFile;
break;
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
case 'r':
{
cmd = LogServerTypes::cmdRotate;
break;
char* arg2 = checkArg(optind, argc, argv);
if( arg2 )
logfilter = string(arg2);
else
logfilter = "";
}
break;
case 'i':
addr = string(optarg);
break;
case 'n':
logname = string(optarg);
break;
case 'b':
cmdonly = 1;
break;
......@@ -149,7 +207,7 @@ int main( int argc, char** argv )
case '?':
default:
printf("? argumnet\n");
printf("Unknown argumnet\n");
return 0;
}
}
......@@ -174,7 +232,7 @@ int main( int argc, char** argv )
cout << "SEND COMMAND: '" << (LogServerTypes::Command)cmd << " data='" << sdata << "'(" << (int)data << ")" << endl;
}
lr.readlogs( addr, port, (LogServerTypes::Command)cmd, data, logname, verb );
lr.readlogs( addr, port, (LogServerTypes::Command)cmd, data, logfilter, verb );
}
catch( const SystemError& err )
{
......@@ -192,3 +250,11 @@ int main( int argc, char** argv )
return 0;
}
// --------------------------------------------------------------------------
char* checkArg( int i, int argc, char* argv[] )
{
if( i < argc && (argv[i])[0] != '-' )
return argv[i];
return 0;
}
// --------------------------------------------------------------------------
Utilities/ULog/logserver.cc
View file @ 7e0114b5
......@@ -114,7 +114,7 @@ int main( int argc, char** argv )
}
auto la2 = make_shared<LogAgregator>("la2");
auto dlog3 = la2->create("dlog3");
auto dlog4 = la2->create("dlog4");
la->add(la2);
......@@ -127,18 +127,20 @@ int main( int argc, char** argv )
}
auto la3 = make_shared<LogAgregator>("la3");
auto dlog5 = la3->create("dlog5");
auto dlog6 = la3->create("dlog6");
la->add(la3);
#if 0
cout << la << endl;
cout << "************ " << endl;
auto lst = la->getLogList();
for( const auto& l: lst )
for( const auto& l : lst )
cout << l.name << endl;
return 0;
#endif
......
Utilities/codegen/tests/TestGen.cc
View file @ 7e0114b5
......@@ -40,13 +40,13 @@ void TestGen::timerInfo( const TimerMessage* tm )
{
if( tm->id == 1 )
{
askTimer(1,0);
askTimer(2,3000);
askTimer(1, 0);
askTimer(2, 3000);
}
else if( tm->id == 2 )
{
askTimer(1,2000);
askTimer(2,0);
askTimer(1, 2000);
askTimer(2, 0);
}
}
// -----------------------------------------------------------------------------
......@@ -58,6 +58,6 @@ void TestGen::sigterm( int signo )
void TestGen::sysCommand( const UniSetTypes::SystemMessage* sm )
{
if( sm->command == SystemMessage::StartUp )
askTimer(1,2000);
askTimer(1, 2000);
}
// -----------------------------------------------------------------------------
conf/libuniset2.spec
View file @ 7e0114b5
......@@ -13,7 +13,7 @@
Name: libuniset2
Version: 2.1
Release: alt3
Release: alt4
Summary: UniSet - library for building distributed industrial control systems
......@@ -455,6 +455,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
%changelog
* Mon Jun 01 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt4
- (LogServer): added suppport "filter mode"
- (LogAgregator): refactoring, change show loglist format
* Sun May 31 2015 Pavel Vainerman <pv@altlinux.ru> 2.1-alt3
- (LogAgregator):
- added support agregator hierarchy
......
extensions/IOControl/IOControl.cc
View file @ 7e0114b5
......@@ -62,7 +62,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
iolog->setLogName(myname);
conf->initLogStream(iolog, prefix + "-log");
loga = make_shared<LogAgregator>(myname+"-loga");
loga = make_shared<LogAgregator>(myname + "-loga");
loga->add(iolog);
loga->add(ulog());
loga->add(dlog());
......
extensions/ModbusMaster/MBExchange.cc
View file @ 7e0114b5
......@@ -51,7 +51,7 @@ MBExchange::MBExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId
mblog->setLogName(myname);
conf->initLogStream(mblog, prefix + "-log");
loga = make_shared<LogAgregator>(myname+"-loga");
loga = make_shared<LogAgregator>(myname + "-loga");
loga->add(mblog);
loga->add(ulog());
loga->add(dlog());
......
extensions/ModbusMaster/MBTCPMaster.cc
View file @ 7e0114b5
......@@ -100,8 +100,9 @@ std::shared_ptr<ModbusClient> MBTCPMaster::initMB( bool reopen )
mbinfo << myname << "(init): ipaddr=" << iaddr << " port=" << port << endl;
auto l = loga->create(myname+"-exchangelog");
auto l = loga->create(myname + "-exchangelog");
mbtcp->setLog(l);
if( ic )
ic->logAgregator()->add(loga);
}
......
extensions/ModbusMaster/MBTCPMultiMaster.cc
View file @ 7e0114b5
......@@ -104,6 +104,7 @@ MBTCPMultiMaster::MBTCPMultiMaster( UniSetTypes::ObjectId objId, UniSetTypes::Ob
auto l = loga->create(sinf.myname);
sinf.mbtcp->setLog(l);
if( ic )
ic->logAgregator()->add(loga);
......
extensions/ModbusMaster/RTUExchange.cc
View file @ 7e0114b5
......@@ -131,8 +131,9 @@ std::shared_ptr<ModbusClient> RTUExchange::initMB( bool reopen )
if( defSpeed != ComPort::ComSpeed0 )
mbrtu->setSpeed(defSpeed);
auto l = loga->create(myname+"-exchangelog");
auto l = loga->create(myname + "-exchangelog");
mbrtu->setLog(l);
if( ic )
ic->logAgregator()->add(loga);
......
extensions/ModbusSlave/MBSlave.cc
View file @ 7e0114b5
......@@ -39,7 +39,7 @@ MBSlave::MBSlave( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId, cons
mblog->setLogName(myname);
conf->initLogStream(mblog, prefix + "-log");
loga = make_shared<LogAgregator>(myname+"-loga");
loga = make_shared<LogAgregator>(myname + "-loga");
loga->add(mblog);
loga->add(ulog());
loga->add(dlog());
......
extensions/ModbusSlave/MBTCPMultiSlave.cc
View file @ 7e0114b5
......@@ -156,7 +156,7 @@ void MBTCPMultiSlave::execute_tcp()
return;
}
auto l = loga->create(myname+"-exchangelog");
auto l = loga->create(myname + "-exchangelog");
sslot->setLog(l);
for( auto && i : cmap )
......
extensions/UNetUDP/UNetExchange.cc
View file @ 7e0114b5
......@@ -28,7 +28,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
unetlog->setLogName(myname);
conf->initLogStream(unetlog, prefix + "-log");
loga = make_shared<LogAgregator>(myname+"-loga");
loga = make_shared<LogAgregator>(myname + "-loga");
loga->add(unetlog);
loga->add(ulog());
loga->add(dlog());
......
extensions/include/UObject_SK.h
View file @ 7e0114b5
......@@ -3,10 +3,10 @@
/*
DO NOT EDIT THIS FILE. IT IS AUTOGENERATED FILE.
ALL YOUR CHANGES WILL BE LOST.
НЕ РЕДАКТИРУЙТЕ ЭТОТ ФАЙЛ. ЭТОТ ФАЙЛ СОЗДАН АВТОМАТИЧЕСКИ.
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
*/
// --------------------------------------------------------------------------
// generate timestamp: 2015-05-31+03:00
// -----------------------------------------------------------------------------
......@@ -28,11 +28,11 @@ class UObject_SK:
public LT_Object
{
public:
UObject_SK( UniSetTypes::ObjectId id, xmlNode* node=UniSetTypes::uniset_conf()->getNode("UObject"), const std::string& argprefix="" );
UObject_SK( UniSetTypes::ObjectId id, xmlNode* node = UniSetTypes::uniset_conf()->getNode("UObject"), const std::string& argprefix = "" );
UObject_SK();
virtual ~UObject_SK();
long getValue( UniSetTypes::ObjectId sid );
void setValue( UniSetTypes::ObjectId sid, long value );
void askSensor( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand, UniSetTypes::ObjectId node = UniSetTypes::uniset_conf()->getLocalNode() );
......@@ -40,105 +40,111 @@ class UObject_SK:
virtual bool setMsg( UniSetTypes::ObjectId code, bool state = true );
inline std::shared_ptr<DebugStream> log(){ return mylog; }
inline std::shared_ptr<LogAgregator> logAgregator(){ return loga; }
inline std::shared_ptr<DebugStream> log()
{
return mylog;
}
inline std::shared_ptr<LogAgregator> logAgregator()
{
return loga;
}
void init_dlog( std::shared_ptr<DebugStream> d );
// "синтаксический сахар"..для логов
#ifndef myinfo
#define myinfo if( log()->debugging(Debug::INFO) ) log()->info()
#endif
#ifndef mywarn
#define mywarn if( log()->debugging(Debug::WARN) ) log()->warn()
#endif
#ifndef mycrit
#define mycrit if( log()->debugging(Debug::CRIT) ) log()->crit()
#endif
#ifndef mylog1
#define mylog1 if( log()->debugging(Debug::LEVEL1) ) log()->level1()
#endif
#ifndef mylog2
#define mylog2 if( log()->debugging(Debug::LEVEL2) ) log()->level2()
#endif
#ifndef mylog3
#define mylog3 if( log()->debugging(Debug::LEVEL3) ) log()->level3()
#endif
#ifndef mylog4
#define mylog4 if( log()->debugging(Debug::LEVEL4) ) log()->level4()
#endif
#ifndef mylog5
#define mylog5 if( log()->debugging(Debug::LEVEL5) ) log()->level5()
#endif
#ifndef mylog6
#define mylog6 if( log()->debugging(Debug::LEVEL6) ) log()->level6()
#endif
#ifndef mylog7
#define mylog7 if( log()->debugging(Debug::LEVEL7) ) log()->level7()
#endif
#ifndef mylog8
#define mylog8 if( log()->debugging(Debug::LEVEL8) ) log()->level8()
#endif
#ifndef mylog9
#define mylog9 if( log()->debugging(Debug::LEVEL9) ) log()->level9()
#endif
#ifndef mylogany
#define mylogany log()->any()
#endif
// Вспомогательные функции для удобства логирования
// ------------------------------------------------------------
/*!< вывод в строку значение всех входов и выходов в формате
ObjectName:
in_xxx = val
in_xxx2 = val
out_zzz = val
...
*/
std::string dumpIO();
/*!< Вывод в строку названия входа/выхода в формате: in_xxx(SensorName)
\param id - идентификатор датчика
\param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
*/
std::string str( UniSetTypes::ObjectId id, bool showLinkName=true );
/*!< Вывод значения входа/выхода в формате: in_xxx(SensorName)=val
\param id - идентификатор датчика
\param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
*/
std::string strval( UniSetTypes::ObjectId id, bool showLinkName=true );
// ------------------------------------------------------------
// "синтаксический сахар"..для логов
#ifndef myinfo
#define myinfo if( log()->debugging(Debug::INFO) ) log()->info()
#endif
#ifndef mywarn
#define mywarn if( log()->debugging(Debug::WARN) ) log()->warn()
#endif
#ifndef mycrit
#define mycrit if( log()->debugging(Debug::CRIT) ) log()->crit()
#endif
#ifndef mylog1
#define mylog1 if( log()->debugging(Debug::LEVEL1) ) log()->level1()
#endif
#ifndef mylog2
#define mylog2 if( log()->debugging(Debug::LEVEL2) ) log()->level2()
#endif
#ifndef mylog3
#define mylog3 if( log()->debugging(Debug::LEVEL3) ) log()->level3()
#endif
#ifndef mylog4
#define mylog4 if( log()->debugging(Debug::LEVEL4) ) log()->level4()
#endif
#ifndef mylog5
#define mylog5 if( log()->debugging(Debug::LEVEL5) ) log()->level5()
#endif
#ifndef mylog6
#define mylog6 if( log()->debugging(Debug::LEVEL6) ) log()->level6()
#endif
#ifndef mylog7
#define mylog7 if( log()->debugging(Debug::LEVEL7) ) log()->level7()
#endif
#ifndef mylog8
#define mylog8 if( log()->debugging(Debug::LEVEL8) ) log()->level8()
#endif
#ifndef mylog9
#define mylog9 if( log()->debugging(Debug::LEVEL9) ) log()->level9()
#endif
#ifndef mylogany
#define mylogany log()->any()
#endif
// Вспомогательные функции для удобства логирования
// ------------------------------------------------------------
/*!< вывод в строку значение всех входов и выходов в формате
ObjectName:
in_xxx = val
in_xxx2 = val
out_zzz = val
...
*/
std::string dumpIO();
/*!< Вывод в строку названия входа/выхода в формате: in_xxx(SensorName)
\param id - идентификатор датчика
\param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
*/
std::string str( UniSetTypes::ObjectId id, bool showLinkName = true );
/*!< Вывод значения входа/выхода в формате: in_xxx(SensorName)=val
\param id - идентификатор датчика
\param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
*/
std::string strval( UniSetTypes::ObjectId id, bool showLinkName = true );
// ------------------------------------------------------------
// Используемые идентификаторы
// Используемые идентификаторы сообщений
// Текущее значение
// --- public variables ---
// --- end of public variables ---
protected:
// --- protected variables ---
// ---- end of protected variables ----
virtual void callback() override;
virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ){};
virtual void askSensors( UniversalIO::UIOCommand cmd ){}
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override{}
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override{}
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) {};
virtual void askSensors( UniversalIO::UIOCommand cmd ) {}
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override {}
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override {}
virtual void sigterm( int signo ) override;
virtual bool activateObject() override;
virtual void testMode( bool state );
......@@ -158,7 +164,7 @@ class UObject_SK:
int resetMsgTime;
// Выполнение очередного шага программы
virtual void step(){}
virtual void step() {}
int sleep_msec; /*!< пауза между итерациями */
bool active;
......@@ -170,22 +176,28 @@ class UObject_SK:
PassiveTimer ptHeartBeat; /*! < период "сердцебиения" */
UniSetTypes::ObjectId idHeartBeat; /*! < идентификатор датчика (AI) "сердцебиения" */
int maxHeartBeat; /*! < сохраняемое значение */
xmlNode* confnode;
/*! получить числовое свойство из конф. файла по привязанной confnode */
int getIntProp(const std::string& name) { return UniSetTypes::uniset_conf()->getIntProp(confnode, name); }
int getIntProp(const std::string& name)
{
return UniSetTypes::uniset_conf()->getIntProp(confnode, name);
}
/*! получить текстовое свойство из конф. файла по привязанной confnode */
inline const std::string getProp(const std::string& name) { return UniSetTypes::uniset_conf()->getProp(confnode, name); }
inline const std::string getProp(const std::string& name)
{
return UniSetTypes::uniset_conf()->getProp(confnode, name);
}
int smReadyTimeout; /*!< время ожидания готовности SM */
std::atomic_bool activated;
int activateTimeout; /*!< время ожидания готовности UniSetObject к работе */
PassiveTimer ptStartUpTimeout; /*!< время на блокировку обработки WatchDog, если недавно был StartUp */
int askPause; /*!< пауза между неудачными попытками заказать датчики */
IOController_i::SensorInfo si;
bool forceOut; /*!< флаг принудительного обноления "выходов" */
std::shared_ptr<LogAgregator> loga;
std::shared_ptr<DebugStream> mylog;
std::shared_ptr<LogServer> logserv;
......@@ -194,15 +206,15 @@ class UObject_SK:
private:
// --- private variables ---
// --- end of private variables ---
// предыдущее значение (для работы UpdateValue())
// Используемые идентификаторы сообщений
bool end_private; // вспомогательное поле (для внутреннего использования при генерировании кода)
};
......
extensions/lib/UObject_SK.cc
View file @ 7e0114b5
......@@ -6,10 +6,10 @@
/*
DO NOT EDIT THIS FILE. IT IS AUTOGENERATED FILE.
ALL YOUR CHANGES WILL BE LOST.
НЕ РЕДАКТИРУЙТЕ ЭТОТ ФАЙЛ. ЭТОТ ФАЙЛ СОЗДАН АВТОМАТИЧЕСКИ.
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
*/
// --------------------------------------------------------------------------
// generate timestamp: 2015-05-31+03:00
// -----------------------------------------------------------------------------
......@@ -31,26 +31,26 @@ using namespace UniSetTypes;
// -----------------------------------------------------------------------------
UObject_SK::UObject_SK():
// Инициализация идентификаторов (имена берутся из конф. файла)
// Инициализация идентификаторов (имена берутся из конф. файла)
// Используемые идентификаторы сообщений (имена берутся из конф. файла)
// Используемые идентификаторы сообщений (имена берутся из конф. файла)
// variables
// variables
active(false),
active(false),
idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(0),
smReadyTimeout(0),
activated(false),
askPause(2000),
forceOut(false),
idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(0),
smReadyTimeout(0),
activated(false),
askPause(2000),
forceOut(false),
end_private(false)
end_private(false)
{
ucrit << "UObject: init failed!!!!!!!!!!!!!!!" << endl;
throw Exception( string(myname+": init failed!!!") );
throw Exception( string(myname + ": init failed!!!") );
}
// -----------------------------------------------------------------------------
// ( val, confval, default val )
......@@ -58,41 +58,42 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
{
if( !s1.empty() )
return s1;
if( !s2.empty() )
return s2;
return s3;
}
// -----------------------------------------------------------------------------
UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argprefix ):
UniSetObject(id),
argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
// Инициализация идентификаторов (имена берутся из конф. файла)
UniSetObject(id),
argprefix( (_argprefix.empty() ? myname + "-" : _argprefix) ),
// Инициализация идентификаторов (имена берутся из конф. файла)
// Используемые идентификаторы сообщений (имена берутся из конф. файла)
// Используемые идентификаторы сообщений (имена берутся из конф. файла)
// variables
// variables
sleep_msec(150),
active(true),
sleep_msec(150),
active(true),
idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(cnode),
smReadyTimeout(0),
activated(false),
askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000)),
forceOut(false),
idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(cnode),
smReadyTimeout(0),
activated(false),
askPause(uniset_conf()->getPIntProp(cnode, "askPause", 2000)),
forceOut(false),
end_private(false)
end_private(false)
{
auto conf = uniset_conf();
if( UniSetTypes::findArgParam("--print-id-list",uniset_conf()->getArgc(),uniset_conf()->getArgv()) != -1 )
if( UniSetTypes::findArgParam("--print-id-list", uniset_conf()->getArgc(), uniset_conf()->getArgv()) != -1 )
{
// abort();
// abort();
}
......@@ -103,15 +104,15 @@ end_private(false)
throw SystemError( err.str() );
}
mylog = make_shared<DebugStream>();
mylog = make_shared<DebugStream>();
mylog->setLogName(myname);
{
ostringstream s;
s << argprefix << "log";
conf->initLogStream(mylog,s.str());
conf->initLogStream(mylog, s.str());
}
loga = make_shared<LogAgregator>(myname+"-loga");
loga = make_shared<LogAgregator>(myname + "-loga");
loga->add(mylog);
loga->add(ulog());
......@@ -128,13 +129,15 @@ end_private(false)
logserv_host = conf->getArg2Param("--" + argprefix + "logserver-host", it.getProp("logserverHost"), "localhost");
logserv_port = conf->getArgPInt("--" + argprefix + "logserver-port", it.getProp("logserverPort"), getId());
}
forceOut = conf->getArgPInt("--" + argprefix + "force-out",it.getProp("forceOut"),false);
string heart = conf->getArgParam("--" + argprefix + "heartbeat-id",it.getProp("heartbeat_id"));
forceOut = conf->getArgPInt("--" + argprefix + "force-out", it.getProp("forceOut"), false);
string heart = conf->getArgParam("--" + argprefix + "heartbeat-id", it.getProp("heartbeat_id"));
if( !heart.empty() )
{
idHeartBeat = conf->getSensorID(heart);
if( idHeartBeat == DefaultObjectId )
{
ostringstream err;
......@@ -142,35 +145,38 @@ end_private(false)
throw SystemError(err.str());
}
int heartbeatTime = conf->getArgPInt("--" + argprefix + "heartbeat-time",it.getProp("heartbeatTime"),conf->getHeartBeatTime());
if( heartbeatTime>0 )
int heartbeatTime = conf->getArgPInt("--" + argprefix + "heartbeat-time", it.getProp("heartbeatTime"), conf->getHeartBeatTime());
if( heartbeatTime > 0 )
ptHeartBeat.setTiming(heartbeatTime);
else
ptHeartBeat.setTiming(UniSetTimer::WaitUpTime);
maxHeartBeat = conf->getArgPInt("--" + argprefix + "heartbeat-max",it.getProp("heartbeat_max"), 10);
maxHeartBeat = conf->getArgPInt("--" + argprefix + "heartbeat-max", it.getProp("heartbeat_max"), 10);
}
// Инициализация значений
sleep_msec = conf->getArgPInt("--" + argprefix + "sleep-msec","150", 150);
sleep_msec = conf->getArgPInt("--" + argprefix + "sleep-msec", "150", 150);
string s_resetTime("");
if( s_resetTime.empty() )
s_resetTime = "500";
resetMsgTime = uni_atoi(init3_str(conf->getArgParam("--" + argprefix + "resetMsgTime"),conf->getProp(cnode,"resetMsgTime"),s_resetTime));
resetMsgTime = uni_atoi(init3_str(conf->getArgParam("--" + argprefix + "resetMsgTime"), conf->getProp(cnode, "resetMsgTime"), s_resetTime));
ptResetMsg.setTiming(resetMsgTime);
smReadyTimeout = conf->getArgInt("--" + argprefix + "sm-ready-timeout","");
smReadyTimeout = conf->getArgInt("--" + argprefix + "sm-ready-timeout", "");
if( smReadyTimeout == 0 )
smReadyTimeout = 60000;
else if( smReadyTimeout < 0 )
smReadyTimeout = UniSetTimer::WaitUpTime;
smTestID = conf->getSensorID(init3_str(conf->getArgParam("--" + argprefix + "sm-test-id"),conf->getProp(cnode,"smTestID"),""));
smTestID = conf->getSensorID(init3_str(conf->getArgParam("--" + argprefix + "sm-test-id"), conf->getProp(cnode, "smTestID"), ""));
activateTimeout = conf->getArgPInt("--" + argprefix + "activate-timeout", 20000);
......@@ -178,7 +184,7 @@ end_private(false)
ptStartUpTimeout.setTiming(msec);
// ===================== <variables> =====================
// ===================== end of <variables> =====================
}
......@@ -191,17 +197,17 @@ UObject_SK::~UObject_SK()
void UObject_SK::updateValues()
{
// Опрашиваем все входы...
}
// -----------------------------------------------------------------------------
void UObject_SK::updatePreviousValues()
{
}
// -----------------------------------------------------------------------------
void UObject_SK::checkSensors()
{
}
// -----------------------------------------------------------------------------
bool UObject_SK::setMsg( UniSetTypes::ObjectId _code, bool _state )
......@@ -209,24 +215,24 @@ bool UObject_SK::setMsg( UniSetTypes::ObjectId _code, bool _state )
if( _code == UniSetTypes::DefaultObjectId )
{
mycrit << myname << "(setMsg): попытка послать сообщение с DefaultObjectId" << endl;
return false;
return false;
}
mylog8 << myname << "(setMsg): " << ( _state ? "SEND " : "RESET " ) << endl;
mylog8 << myname << "(setMsg): " << ( _state ? "SEND " : "RESET " ) << endl;
// взводим автоматический сброс
if( _state )
ptResetMsg.reset();
// взводим автоматический сброс
if( _state )
ptResetMsg.reset();
mylog8 << myname << "(setMsg): not found MessgeOID?!!" << endl;
mylog8 << myname << "(setMsg): not found MessgeOID?!!" << endl;
return false;
}
// -----------------------------------------------------------------------------
void UObject_SK::resetMsg()
{
// reset messages
// reset messages
}
// -----------------------------------------------------------------------------
......@@ -236,28 +242,28 @@ void UObject_SK::testMode( bool _state )
return;
// отключаем все выходы
}
// -----------------------------------------------------------------------------
std::string UObject_SK::dumpIO()
{
ostringstream s;
s << myname << ": " << endl;
return s.str();
}
// ----------------------------------------------------------------------------
std::string UObject_SK::str( UniSetTypes::ObjectId id, bool showLinkName )
{
ostringstream s;
return "";
}
// ----------------------------------------------------------------------------
std::string UObject_SK::strval( UniSetTypes::ObjectId id, bool showLinkName )
{
ostringstream s;
return "";
}
// ----------------------------------------------------------------------------
......@@ -278,19 +284,19 @@ void UObject_SK::processingMessage( UniSetTypes::VoidMessage* _msg )
{
case Message::SensorInfo:
preSensorInfo( reinterpret_cast<SensorMessage*>(_msg) );
break;
break;
case Message::Timer:
preTimerInfo( reinterpret_cast<TimerMessage*>(_msg) );
break;
break;
case Message::SysCommand:
preSysCommand( reinterpret_cast<SystemMessage*>(_msg) );
break;
break;
default:
break;
}
}
}
catch( const Exception& ex )
{
......@@ -304,11 +310,13 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
{
case SystemMessage::WatchDog:
uinfo << myname << "(preSysCommand): WatchDog" << endl;
if( !active || !ptStartUpTimeout.checkTime() )
{
uwarn << myname << "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
break;
}
case SystemMessage::StartUp:
{
if( !logserv_host.empty() && logserv_port != 0 && !logserv->isRunning() )
......@@ -328,21 +336,22 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
active = true;
break;
}
case SystemMessage::FoldUp:
case SystemMessage::Finish:
preAskSensors(UniversalIO::UIODontNotify);
askSensors(UniversalIO::UIODontNotify);
break;
case SystemMessage::LogRotate:
{
// переоткрываем логи
mylogany << myname << "(preSysCommand): logRotate" << endl;
string fname( log()->getLogFile() );
if( !fname.empty() )
{
mylog->logFile(fname.c_str(),true);
mylog->logFile(fname.c_str(), true);
mylogany << myname << "(preSysCommand): ***************** mylog LOG ROTATE *****************" << endl;
}
}
......@@ -351,7 +360,7 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
default:
break;
}
sysCommand(_sm);
}
// -----------------------------------------------------------------------------
......@@ -364,7 +373,7 @@ void UObject_SK::sigterm( int signo )
// -----------------------------------------------------------------------------
bool UObject_SK::activateObject()
{
// блокирование обработки Startup
// блокирование обработки Startup
// пока не пройдёт инициализация датчиков
// см. preSysCommand()
{
......@@ -390,24 +399,24 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
if( _testID == DefaultObjectId )
return;
uinfo << myname << "(waitSM): waiting SM ready "
<< wait_msec << " msec"
<< " testID=" << _testID << endl;
if( !ui->waitReady(_testID,wait_msec) )
<< wait_msec << " msec"
<< " testID=" << _testID << endl;
if( !ui->waitReady(_testID, wait_msec) )
{
ostringstream err;
err << myname
<< "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение "
err << myname
<< "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение "
<< wait_msec << " мсек";
ucrit << err.str() << endl;
// terminate();
// abort();
ucrit << err.str() << endl;
// terminate();
// abort();
raise(SIGTERM);
terminate();
// throw SystemError(err.str());
// throw SystemError(err.str());
}
......@@ -419,37 +428,39 @@ void UObject_SK::callback()
{
if( !active )
return;
try
{
// проверка таймеров
checkTimers(this);
if( resetMsgTime>0 && trResetMsg.hi(ptResetMsg.checkTime()) )
if( resetMsgTime > 0 && trResetMsg.hi(ptResetMsg.checkTime()) )
{
// cout << myname << ": ********* reset messages *********" << endl;
// cout << myname << ": ********* reset messages *********" << endl;
resetMsg();
}
// обработка сообщений (таймеров и т.п.)
for( unsigned int i=0; i<20; i++ )
for( unsigned int i = 0; i < 20; i++ )
{
if( !receiveMessage(msg) )
break;
processingMessage(&msg);
updateOutputs(forceOut);
// updatePreviousValues();
// updatePreviousValues();
}
// Выполнение шага программы
step();
// "сердцебиение"
if( idHeartBeat!=DefaultObjectId && ptHeartBeat.checkTime() )
if( idHeartBeat != DefaultObjectId && ptHeartBeat.checkTime() )
{
try
{
ui->setValue(idHeartBeat,maxHeartBeat);
ui->setValue(idHeartBeat, maxHeartBeat);
ptHeartBeat.reset();
}
catch( const Exception& ex )
......@@ -464,46 +475,46 @@ void UObject_SK::callback()
}
catch( const Exception& ex )
{
ucrit << myname << "(execute): " << ex << endl;
ucrit << myname << "(execute): " << ex << endl;
}
catch( const CORBA::SystemException& ex )
{
ucrit << myname << "(execute): СORBA::SystemException: "
<< ex.NP_minorString() << endl;
ucrit << myname << "(execute): СORBA::SystemException: "
<< ex.NP_minorString() << endl;
}
catch( const std::exception& ex )
{
ucrit << myname << "(execute): catch " << ex.what() << endl;
}
catch( const std::exception&ex )
{
ucrit << myname << "(execute): catch " << ex.what() << endl;
}
if( !active )
return;
msleep( sleep_msec );
}
// -----------------------------------------------------------------------------
void UObject_SK::setValue( UniSetTypes::ObjectId _sid, long _val )
{
ui->setValue(_sid,_val);
ui->setValue(_sid, _val);
}
// -----------------------------------------------------------------------------
void UObject_SK::updateOutputs( bool _force )
{
}
// -----------------------------------------------------------------------------
void UObject_SK::preSensorInfo( const UniSetTypes::SensorMessage* _sm )
{
sensorInfo(_sm);
}
// -----------------------------------------------------------------------------
void UObject_SK::askSensor( UniSetTypes::ObjectId _sid, UniversalIO::UIOCommand _cmd, UniSetTypes::ObjectId _node )
{
ui->askRemoteSensor(_sid,_cmd,_node,getId());
ui->askRemoteSensor(_sid, _cmd, _node, getId());
}
// -----------------------------------------------------------------------------
long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
......@@ -516,7 +527,7 @@ long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
}
catch( const Exception& ex )
{
ucrit << myname << "(getValue): " << ex << endl;
ucrit << myname << "(getValue): " << ex << endl;
throw;
}
}
......@@ -525,33 +536,35 @@ long UObject_SK::getValue( UniSetTypes::ObjectId _sid )
void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
{
PassiveTimer ptAct(activateTimeout);
while( !activated && !ptAct.checkTime() )
{
{
cout << myname << "(preAskSensors): wait activate..." << endl;
msleep(300);
if( activated )
break;
}
if( !activated )
ucrit << myname
<< "(preAskSensors): ************* don`t activated?! ************" << endl;
<< "(preAskSensors): ************* don`t activated?! ************" << endl;
for( ;; )
{
try
{
return;
}
catch( const Exception& ex )
{
ucrit << myname << "(preAskSensors): " << ex << endl;
ucrit << myname << "(preAskSensors): " << ex << endl;
}
catch( const std::exception& ex )
{
ucrit << myname << "(execute): catch " << ex.what() << endl;
}
catch( const std::exception&ex )
{
ucrit << myname << "(execute): catch " << ex.what() << endl;
}
msleep(askPause);
}
......
include/DebugStream.h
View file @ 7e0114b5
......@@ -137,16 +137,28 @@ class DebugStream : public std::ostream
}
// имя лог файла можно установить отдельно, но не вклчать запись..
inline void setLogFile( const std::string& n ){ fname = n; }
inline void setLogFile( const std::string& n )
{
fname = n;
}
// включена ли запись лог-файла
inline bool isOnLogFile(){ return isWriteLogFile; }
inline bool isOnLogFile()
{
return isWriteLogFile;
}
// включить запись лог файла
inline void onLogFile( bool truncate=false ){ logFile(fname,truncate); }
inline void onLogFile( bool truncate = false )
{
logFile(fname, truncate);
}
// отключить запись логфайла
inline void offLogFile(){ logFile(""); }
inline void offLogFile()
{
logFile("");
}
/// Returns true if t is part of the current debug level.
inline bool debugging(Debug::type t = Debug::ANY) const
......
include/LogAgregator.h
View file @ 7e0114b5
......@@ -3,6 +3,7 @@
// -------------------------------------------------------------------------
#include <string>
#include <memory>
#include <regex>
#include <list>
#include <vector>
#include <unordered_map>
......@@ -111,17 +112,17 @@ class LogAgregator:
{
public:
const std::string sep= {"/"}; /*< раздедитель для имён подчинённых агрегаторов */
const std::string sep = {"/"}; /*< раздедитель для имён подчинённых агрегаторов */
explicit LogAgregator( const std::string& name, Debug::type t );
explicit LogAgregator( const std::string& name="" );
explicit LogAgregator( const std::string& name = "" );
virtual ~LogAgregator();
virtual void logFile( const std::string& f, bool truncate = false ) override;
void add( std::shared_ptr<LogAgregator> log, const std::string& lname="" );
void add( std::shared_ptr<DebugStream> log, const std::string& lname="" );
void add( std::shared_ptr<LogAgregator> log, const std::string& lname = "" );
void add( std::shared_ptr<DebugStream> log, const std::string& lname = "" );
std::shared_ptr<DebugStream> create( const std::string& logname );
......@@ -132,16 +133,12 @@ class LogAgregator:
void offLogFile( const std::string& logname );
void onLogFile( const std::string& logname );
// найти лог..
std::shared_ptr<DebugStream> getLog( const std::string& logname );
friend std::ostream& operator<<(std::ostream& os, LogAgregator& la );
friend std::ostream& operator<<(std::ostream& os, std::shared_ptr<LogAgregator> la );
static std::vector<std::string> split_first( const std::string& lname, const std::string s = "/" );
struct iLog
{
iLog( std::shared_ptr<DebugStream>& l, const std::string& nm ):log(l),name(nm){}
iLog( std::shared_ptr<DebugStream>& l, const std::string& nm ): log(l), name(nm) {}
std::shared_ptr<DebugStream> log;
std::string name;
......@@ -155,6 +152,11 @@ class LogAgregator:
std::list<iLog> getLogList();
std::list<iLog> getLogList( const std::string& regexp_str );
friend std::ostream& operator<<(std::ostream& os, LogAgregator& la );
friend std::ostream& operator<<(std::ostream& os, std::shared_ptr<LogAgregator> la );
static std::vector<std::string> splitFirst( const std::string& lname, const std::string s = "/" );
protected:
void logOnEvent( const std::string& s );
void addLog( std::shared_ptr<DebugStream> l, const std::string& lname );
......@@ -164,13 +166,13 @@ class LogAgregator:
std::shared_ptr<DebugStream> findLog( const std::string& lname );
// вывод в виде "дерева"
std::ostream& print_tree(std::ostream& os, const std::string& g_tab="");
std::ostream& printTree(std::ostream& os, const std::string& g_tab = "");
// получить список с именами (длинными) и с указателями на логи
std::list<iLog> makeLogNameList( const std::string& prefix );
private:
typedef std::unordered_map<std::string,std::shared_ptr<DebugStream>> LogMap;
typedef std::unordered_map<std::string, std::shared_ptr<DebugStream>> LogMap;
LogMap lmap;
};
// -------------------------------------------------------------------------
......
include/LogServerTypes.h
View file @ 7e0114b5
......@@ -17,7 +17,8 @@ namespace LogServerTypes
cmdRotate, /*!< пересоздать файл с логами */
cmdOffLogFile, /*!< отключить запись файла логов (если включена) */
cmdOnLogFile, /*!< включить запись файла логов (если была отключена) */
cmdList /*!< вывести список контролируемых логов */
cmdList, /*!< вывести список контролируемых логов */
cmdFilterMode /*!< включить режим работы "фильтр" - вывод только от интересующих логов, заданных в lognmae (regexp) */
// cmdSetLogFile
};
......@@ -33,7 +34,7 @@ namespace LogServerTypes
Command cmd;
unsigned int data;
static const size_t MAXLOGNAME = 20;
static const size_t MAXLOGNAME = 30;
char logname[MAXLOGNAME + 1]; // +1 reserverd for '\0'
void setLogName( const std::string& name );
......
include/LogSession.h
View file @ 7e0114b5
......@@ -68,6 +68,7 @@ class LogSession:
std::string caddr;
std::shared_ptr<DebugStream> log;
std::shared_ptr<LogAgregator> alog;
sigc::connection conn;
// PassiveTimer ptSessionTimeout;
FinalSlot slFin;
......
src/Log/LogAgregator.cc
View file @ 7e0114b5
#include <memory>
#include <iomanip>
#include <regex>
#include <sstream>
#include "DebugExtBuf.h"
#include "LogAgregator.h"
......@@ -8,7 +7,7 @@
using namespace std;
// -------------------------------------------------------------------------
LogAgregator::LogAgregator( const std::string& name ):
LogAgregator(name,Debug::ANY)
LogAgregator(name, Debug::ANY)
{
}
// ------------------------------------------------------------------------
......@@ -63,43 +62,26 @@ std::shared_ptr<DebugStream> LogAgregator::create( const std::string& logname )
void LogAgregator::add( std::shared_ptr<DebugStream> l, const std::string& lname )
{
auto lag = std::dynamic_pointer_cast<LogAgregator>(l);
if( lag )
addLogAgregator(lag, (lname.empty() ? l->getLogName(): lname) );
addLogAgregator(lag, (lname.empty() ? l->getLogName() : lname) );
else
addLog(l,(lname.empty() ? l->getLogName(): lname));
addLog(l, (lname.empty() ? l->getLogName() : lname));
}
// ------------------------------------------------------------------------
void LogAgregator::add( std::shared_ptr<LogAgregator> loga, const std::string& lname )
{
addLogAgregator(loga, (lname.empty() ? loga->getLogName(): lname) );
addLogAgregator(loga, (lname.empty() ? loga->getLogName() : lname) );
}
// -------------------------------------------------------------------------
void LogAgregator::addLogAgregator( std::shared_ptr<LogAgregator> la, const std::string& lname )
{
auto i = lmap.find(lname);
if( i != lmap.end() )
return;
addLog(la,lname);
#if 0
auto lst = la->getLogList();
for( auto&& l: lst )
{
auto lag = std::dynamic_pointer_cast<LogAgregator>(l.log);
if( lag )
{
std::ostringstream s;
s << lname << sep << lag->getLogName();
addLogAgregator(lag,s.str()); // рекурсия..
}
else
{
std::ostringstream s;
s << lname << sep << l.log->getLogName();
addLog(l.log,s.str());
}
}
#endif
addLog(la, lname);
}
// ------------------------------------------------------------------------
void LogAgregator::addLog( std::shared_ptr<DebugStream> l, const std::string& lname )
......@@ -161,7 +143,7 @@ std::shared_ptr<DebugStream> LogAgregator::getLog( const std::string& logname )
return findLog(logname);
}
// -------------------------------------------------------------------------
std::ostream& LogAgregator::print_tree( std::ostream& os, const std::string& g_tab )
std::ostream& LogAgregator::printTree( std::ostream& os, const std::string& g_tab )
{
ostringstream s;
s << " ." << g_tab;
......@@ -170,17 +152,22 @@ std::ostream& LogAgregator::print_tree( std::ostream& os, const std::string& g_t
os << g_tab << getLogName() << sep << endl; // << setw(6) << " " << "[ " << Debug::str(DebugStream::level()) << " ]" << endl;
std::list<std::shared_ptr<DebugStream>> lst;
for( const auto& l: lmap )
for( const auto& l : lmap )
lst.push_back(l.second);
lst.sort([](const std::shared_ptr<DebugStream>& a, const std::shared_ptr<DebugStream>& b) { return a->getLogName() < b->getLogName(); });
lst.sort([](const std::shared_ptr<DebugStream>& a, const std::shared_ptr<DebugStream>& b)
{
return a->getLogName() < b->getLogName();
});
for( auto&& l: lst )
for( auto && l : lst )
{
auto ag = dynamic_pointer_cast<LogAgregator>(l);
if( ag )
{
ag->print_tree(os,s_tab);
ag->printTree(os, s_tab);
}
else
os << s_tab << l->getLogName() << " [ " << Debug::str(l->level()) << " ]" << endl;
......@@ -191,7 +178,7 @@ std::ostream& LogAgregator::print_tree( std::ostream& os, const std::string& g_t
// -------------------------------------------------------------------------
std::ostream& operator<<( std::ostream& os, LogAgregator& la )
{
la.print_tree(os);
la.printTree(os,"");
return os;
}
// -------------------------------------------------------------------------
......@@ -200,26 +187,28 @@ std::ostream& operator<<(std::ostream& os, std::shared_ptr<LogAgregator> la )
return os << *(la.get());
}
// -------------------------------------------------------------------------
std::vector<std::string> LogAgregator::split_first( const std::string& lname, const std::string s )
std::vector<std::string> LogAgregator::splitFirst( const std::string& lname, const std::string s )
{
string::size_type pos = lname.find(s);
if( pos == string::npos )
{
vector<string> v{lname,""};
vector<string> v{lname, ""};
return std::move(v);
}
vector<string> v={lname.substr(0, pos), lname.substr(pos+1, lname.length()) };
vector<string> v = {lname.substr(0, pos), lname.substr(pos + 1, lname.length()) };
return std::move(v);
}
// -------------------------------------------------------------------------
std::shared_ptr<DebugStream> LogAgregator::findLog( const std::string& lname )
{
auto v = split_first(lname,sep);
auto v = splitFirst(lname, sep);
if( v[1].empty() )
{
auto l = lmap.find(lname);
if( l == lmap.end() )
return nullptr;
......@@ -227,10 +216,12 @@ std::shared_ptr<DebugStream> LogAgregator::findLog( const std::string& lname )
}
auto l = lmap.find(v[0]);
if( l == lmap.end() )
return nullptr;
auto ag = dynamic_pointer_cast<LogAgregator>(l->second);
if( !ag )
return l->second;
......@@ -246,7 +237,8 @@ std::list<LogAgregator::iLog> LogAgregator::getLogList( const std::string& regex
std::regex rule(regex_str);
auto lst = getLogList();
for( const auto& i: lst )
for( const auto& i : lst )
{
if( std::regex_match(i.name, rule) )
{
......@@ -265,7 +257,10 @@ std::list<LogAgregator::iLog> LogAgregator::getLogList( const std::string& regex
std::list<LogAgregator::iLog> LogAgregator::getLogList()
{
std::list<LogAgregator::iLog> lst = makeLogNameList("");
lst.sort([](const LogAgregator::iLog& a, const LogAgregator::iLog& b) { return a.name < b.name; });
lst.sort([](const LogAgregator::iLog & a, const LogAgregator::iLog & b)
{
return a.name < b.name;
});
return std::move(lst);
}
// -------------------------------------------------------------------------
......@@ -278,17 +273,18 @@ std::list<LogAgregator::iLog> LogAgregator::makeLogNameList( const std::string&
string p(s.str());
string p2(p+sep);
string p2(p + sep);
for( auto&& l : lmap )
for( auto && l : lmap )
{
auto ag = dynamic_pointer_cast<LogAgregator>(l.second);
if( ag )
lst.splice(lst.end(), ag->makeLogNameList(p2));
else
{
std::string nm(p2+l.second->getLogName());
LogAgregator::iLog il(l.second,std::move(nm) );
std::string nm(p2 + l.second->getLogName());
LogAgregator::iLog il(l.second, std::move(nm) );
lst.push_back( std::move(il) );
}
}
......@@ -299,6 +295,7 @@ std::list<LogAgregator::iLog> LogAgregator::makeLogNameList( const std::string&
void LogAgregator::offLogFile( const std::string& logname )
{
auto l = findLog(logname);
if( l )
l->offLogFile();
}
......@@ -306,7 +303,9 @@ void LogAgregator::offLogFile( const std::string& logname )
void LogAgregator::onLogFile( const std::string& logname )
{
auto l = findLog(logname);
if( l )
l->onLogFile();
}
// -------------------------------------------------------------------------
src/Log/LogReader.cc
View file @ 7e0114b5
......@@ -205,8 +205,8 @@ void LogReader::readlogs( const std::string& _addr, ost::tpport_t _port, LogServ
log << buf;
// if( msg.cmd == LogServerTypes::cmdList )
// break;
// if( msg.cmd == LogServerTypes::cmdList )
// break;
}
else
break;
......
src/Log/LogServerTypes.cc
View file @ 7e0114b5
......@@ -28,6 +28,9 @@ std::ostream& LogServerTypes::operator<<(std::ostream& os, LogServerTypes::Comma
case LogServerTypes::cmdList:
return os << "cmdList";
case LogServerTypes::cmdFilterMode:
return os << "cmdFilterMode";
default:
return os << "Unknown";
}
......
src/Log/LogSession.cc
View file @ 7e0114b5
......@@ -46,11 +46,12 @@ LogSession::LogSession( ost::TCPSocket& server, std::shared_ptr<DebugStream>& _l
//slog.addLevel(Debug::ANY);
if( log )
log->signal_stream_event().connect( sigc::mem_fun(this, &LogSession::logOnEvent) );
conn = log->signal_stream_event().connect( sigc::mem_fun(this, &LogSession::logOnEvent) );
else
slog.crit() << "LOG NULL!!" << endl;
auto ag = dynamic_pointer_cast<LogAgregator>(log);
if( ag )
alog = ag;
}
......@@ -124,7 +125,7 @@ void LogSession::run()
{
if( cmdLogName == "ALL" || log->getLogFile() == cmdLogName )
{
LogAgregator::iLog llog(log,log->getLogName());
LogAgregator::iLog llog(log, log->getLogName());
loglist.push_back(llog);
}
}
......@@ -136,14 +137,23 @@ void LogSession::run()
ostringstream s;
s << "List of managed logs:" << endl;
s << "=====================" << endl;
if( !alog )
{
s << log->getLogName() << endl;
}
else
{
s << alog << endl;
if( !cmdLogName.empty() )
{
auto lst = alog->getLogList(cmdLogName);
for( const auto& l: lst )
s << l.name << " [ " << Debug::str(l.log->level()) << " ]" << endl;
}
else
s << alog << endl;
}
s << "=====================" << endl << endl;
if( isPending(Socket::pendingOutput, cmdTimeout) )
......@@ -158,8 +168,15 @@ void LogSession::run()
return;
}
if( msg.cmd == LogServerTypes::cmdFilterMode )
{
// отлючаем старый обработчик
if( conn )
conn.disconnect();
}
// обрабатываем команды только если нашли подходящие логи
for( auto&& l : loglist )
for( auto && l : loglist )
{
// Обработка команд..
// \warning Работа с логом ведётся без mutex-а, хотя он разделяется отдельными потоками
......@@ -179,18 +196,22 @@ void LogSession::run()
case LogServerTypes::cmdRotate:
l.log->onLogFile(true);
break;
break;
case LogServerTypes::cmdList: // обработали выше (в начале)
break;
break;
case LogServerTypes::cmdOffLogFile:
l.log->offLogFile();
break;
break;
case LogServerTypes::cmdOnLogFile:
l.log->onLogFile();
break;
break;
case LogServerTypes::cmdFilterMode:
l.log->signal_stream_event().connect( sigc::mem_fun(this, &LogSession::logOnEvent) );
break;
default:
slog.warn() << peername << "(run): Unknown command '" << msg.cmd << "'" << endl;
......
src/ObjectRepository/UniSetTypes.cc
View file @ 7e0114b5
......@@ -213,7 +213,7 @@ UniSetTypes::IDList UniSetTypes::explode( const string& str, char sep )
}
while( pos != string::npos );
return l;
return std::move(l);
}
// -------------------------------------------------------------------------
std::vector<std::string> UniSetTypes::explode_str( const string& str, char sep )
......@@ -236,7 +236,7 @@ std::vector<std::string> UniSetTypes::explode_str( const string& str, char sep )
}
while( pos != string::npos );
return v;
return std::move(v);
}
// ------------------------------------------------------------------------------------------
bool UniSetTypes::is_digit( const std::string& s )
......
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