make style

extensions/DBServer-MySQL/DBServer_MySQL.cc

@@ -38,7 +38,7 @@ using namespace UniSetTypes;
 using namespace std;
 // --------------------------------------------------------------------------
 DBServer_MySQL::DBServer_MySQL(ObjectId id, const std::string& prefix ):
-	DBServer(id,prefix),
+	DBServer(id, prefix),
 	PingTime(300000),
 	ReconnectTime(180000),
 	connect_ok(false),
@@ -59,7 +59,7 @@ DBServer_MySQL::DBServer_MySQL(ObjectId id, const std::string& prefix ):
 }
 
 DBServer_MySQL::DBServer_MySQL( const std::string& prefix ):
-	DBServer_MySQL(uniset_conf()->getDBServer(),prefix)
+	DBServer_MySQL(uniset_conf()->getDBServer(), prefix)
 {
 }
 //--------------------------------------------------------------------------------------------
@@ -150,7 +150,7 @@ bool DBServer_MySQL::writeToBase( const string& query )
 			qbuf.pop();
 
 			dbcrit << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
-				  << ") overflow! lost query: " << qlost << endl;
+				   << ") overflow! lost query: " << qlost << endl;
 		}
 
 		return false;
@@ -191,7 +191,7 @@ void DBServer_MySQL::flushBuffer()
 
 		if( !err.empty() )
 			dbcrit << myname << "(writeToBase): error: " << err <<
-				  " lost query: " << qbuf.front() << endl;
+				   " lost query: " << qbuf.front() << endl;
 
 		qbuf.pop();
 	}
@@ -293,16 +293,16 @@ void DBServer_MySQL::initDBServer()
 		dbnode = "localhost";
 
 	dbinfo << myname << "(init): connect dbnode=" << dbnode
-		  << "\tdbname=" << dbname
-		  << " pingTime=" << PingTime
-		  << " ReconnectTime=" << ReconnectTime << endl;
+		   << "\tdbname=" << dbname
+		   << " pingTime=" << PingTime
+		   << " ReconnectTime=" << ReconnectTime << endl;
 
 	if( !db->connect(dbnode, user, password, dbname) )
 	{
 		//        ostringstream err;
 		dbcrit << myname
-			  << "(init): DB connection error: "
-			  << db->error() << endl;
+			   << "(init): DB connection error: "
+			   << db->error() << endl;
 		//        throw Exception( string(myname+"(init): не смогли создать соединение с БД "+db->error()) );
 		askTimer(DBServer_MySQL::ReconnectTimer, ReconnectTime);
 	}

extensions/DBServer-MySQL/main.cc

@@ -15,13 +15,13 @@ int main(int argc, char** argv)
 		if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
 		{
 			cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
-			DBServer_MySQL::help_print(argc,argv);
+			DBServer_MySQL::help_print(argc, argv);
 			return 0;
 		}
 
 		auto conf = uniset_init(argc, argv, "configure.xml");
 
-		auto db = DBServer_MySQL::init_dbserver(argc,argv);
+		auto db = DBServer_MySQL::init_dbserver(argc, argv);
 
 		auto act = UniSetActivator::Instance();
 		act->add(db);

extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc

@@ -14,7 +14,7 @@ using namespace UniSetTypes;
 using namespace std;
 // --------------------------------------------------------------------------
 DBServer_PostgreSQL::DBServer_PostgreSQL(ObjectId id, const std::string& prefix ):
-	DBServer(id,prefix),
+	DBServer(id, prefix),
 	PingTime(300000),
 	ReconnectTime(180000),
 	connect_ok(false),
@@ -90,6 +90,7 @@ void DBServer_PostgreSQL::sysCommand( const UniSetTypes::SystemMessage* sm )
 void DBServer_PostgreSQL::confirmInfo( const UniSetTypes::ConfirmMessage* cem )
 {
 	DBServer::confirmInfo(cem);
+
 	try
 	{
 		ostringstream data;
@@ -138,7 +139,7 @@ bool DBServer_PostgreSQL::writeToBase( const string& query )
 
 			qbuf.pop();
 			dbcrit << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
-				  << ") overflow! lost query: " << qlost << endl;
+				   << ") overflow! lost query: " << qlost << endl;
 		}
 
 		return false;
@@ -268,9 +269,9 @@ void DBServer_PostgreSQL::initDBServer()
 		dbnode = "localhost";
 
 	dbinfo <<  myname << "(init): connect dbnode=" << dbnode
-		  << "\tdbname=" << dbname
-		  << " pingTime=" << PingTime
-		  << " ReconnectTime=" << ReconnectTime << endl;
+		   << "\tdbname=" << dbname
+		   << " pingTime=" << PingTime
+		   << " ReconnectTime=" << ReconnectTime << endl;
 
 	if( !db->connect(dbnode, user, password, dbname) )
 	{

extensions/DBServer-PostgreSQL/main.cc

@@ -9,6 +9,7 @@ using namespace std;
 int main(int argc, char** argv)
 {
 	std::ios::sync_with_stdio(false);
+
 	try
 	{
 		if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )

extensions/DBServer-SQLite/DBServer_SQLite.cc

@@ -38,7 +38,7 @@ using namespace UniSetTypes;
 using namespace std;
 // --------------------------------------------------------------------------
 DBServer_SQLite::DBServer_SQLite( ObjectId id, const std::string& prefix ):
-	DBServer(id,prefix),
+	DBServer(id, prefix),
 	PingTime(300000),
 	ReconnectTime(180000),
 	connect_ok(false),
@@ -57,7 +57,7 @@ DBServer_SQLite::DBServer_SQLite( ObjectId id, const std::string& prefix ):
 }
 
 DBServer_SQLite::DBServer_SQLite( const std::string& prefix ):
-	DBServer_SQLite(uniset_conf()->getDBServer(),prefix)
+	DBServer_SQLite(uniset_conf()->getDBServer(), prefix)
 {
 }
 //--------------------------------------------------------------------------------------------
@@ -147,7 +147,7 @@ bool DBServer_SQLite::writeToBase( const string& query )
 			qbuf.pop();
 
 			dbcrit << myname << "(writeToBase): DB not connected! buffer(" << qbufSize
-				  << ") overflow! lost query: " << qlost << endl;
+				   << ") overflow! lost query: " << qlost << endl;
 		}
 
 		return false;
@@ -173,7 +173,7 @@ void DBServer_SQLite::flushBuffer()
 		if( !db->insert(qbuf.front()) )
 		{
 			dbcrit << myname << "(writeToBase): error: " << db->error() <<
-				  " lost query: " << qbuf.front() << endl;
+				   " lost query: " << qbuf.front() << endl;
 		}
 
 		qbuf.pop();
@@ -270,15 +270,15 @@ void DBServer_SQLite::initDBServer()
 		lastRemove = false;
 
 	dbinfo <<  myname << "(init): connect dbfile=" << dbfile
-		  << " pingTime=" << PingTime
-		  << " ReconnectTime=" << ReconnectTime << endl;
+		   << " pingTime=" << PingTime
+		   << " ReconnectTime=" << ReconnectTime << endl;
 
 	if( !db->connect(dbfile, false) )
 	{
 		//        ostringstream err;
 		dbcrit << myname
-			  << "(init): DB connection error: "
-			  << db->error() << endl;
+			   << "(init): DB connection error: "
+			   << db->error() << endl;
 		//        throw Exception( string(myname+"(init): не смогли создать соединение с БД "+db->error()) );
 		askTimer(DBServer_SQLite::ReconnectTimer, ReconnectTime);
 	}
@@ -323,6 +323,7 @@ void DBServer_SQLite::createTables( SQLiteInterface* db )
 void DBServer_SQLite::timerInfo( const UniSetTypes::TimerMessage* tm )
 {
 	DBServer::timerInfo(tm);
+
 	switch( tm->id )
 	{
 		case DBServer_SQLite::PingTimer:

extensions/DBServer-SQLite/main.cc

@@ -20,13 +20,13 @@ int main(int argc, char** argv)
 		if( argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) )
 		{
 			cout << "--confile filename       - configuration file. Default: configure.xml" << endl;
-			DBServer_SQLite::help_print(argc,argv);
+			DBServer_SQLite::help_print(argc, argv);
 			return 0;
 		}
 
 		auto conf = uniset_init(argc, argv, "configure.xml");
 
-		auto db = DBServer_SQLite::init_dbserver(argc,argv);
+		auto db = DBServer_SQLite::init_dbserver(argc, argv);
 
 		auto act = UniSetActivator::Instance();
 		act->add(db);

extensions/IOControl/IOControl.cc

@@ -60,7 +60,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 
 	iolog = make_shared<DebugStream>();
 	iolog->setLogName(myname);
-	conf->initLogStream(iolog,prefix+"-log");
+	conf->initLogStream(iolog, prefix + "-log");
 
 	loga = make_shared<LogAgregator>();
 	loga->add(iolog);
@@ -76,7 +76,8 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	UniXML::iterator it(cnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", cnode );
+	logserv->init( prefix + "-logserver", cnode );
+
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
 		logserv_host = conf->getArg2Param("--" + prefix + "-logserver-host", it.getProp("logserverHost"), "localhost");
@@ -107,8 +108,8 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 			if( cards[i] == NULL )
 			{
 				iolog3 << myname << "(init): Card N" << i
-					  << " DISABLED! dev='"
-					  << iodev << "'" << endl;
+					   << " DISABLED! dev='"
+					   << iodev << "'" << endl;
 			}
 		}
 		else
@@ -141,8 +142,8 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 					if( !stype.empty() )
 					{
 						ioinfo << myname
-							  << "(init): card" << i
-							  << " subdev" << s << " set type " << stype << endl;
+							   << "(init): card" << i
+							   << " subdev" << s << " set type " << stype << endl;
 
 						cards[i]->configureSubdev(s - 1, st);
 					}
@@ -206,7 +207,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	s_fvalue = conf->getArgParam("--" + prefix + "-s-filter-value");
 
 	ioinfo << myname << "(init): read s_field='" << s_field
-		  << "' s_fvalue='" << s_fvalue << "'" << endl;
+		   << "' s_fvalue='" << s_fvalue << "'" << endl;
 
 	int blink_msec = conf->getArgPInt("--" + prefix + "-blink-time", it.getProp("blink-time"), 300);
 	ptBlink.setTiming(blink_msec);
@@ -232,8 +233,8 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	{
 		sidTestSMReady = conf->getSensorID("TestMode_S");
 		iowarn << myname
-			  << "(init): Unknown ID for sm-ready-test-sid (--" << prefix << "-sm-ready-test-sid)."
-			  << " Use 'TestMode_S'" << endl;
+			   << "(init): Unknown ID for sm-ready-test-sid (--" << prefix << "-sm-ready-test-sid)."
+			   << " Use 'TestMode_S'" << endl;
 	}
 	else
 		ioinfo << myname << "(init): test-sid: " << sm_ready_sid << endl;
@@ -421,7 +422,7 @@ void IOControl::execute()
 		catch( const CORBA::SystemException& ex )
 		{
 			iolog3 << myname << "(execute): CORBA::SystemException: "
-				  << ex.NP_minorString() << endl;
+				   << ex.NP_minorString() << endl;
 		}
 		catch(...)
 		{
@@ -538,11 +539,11 @@ void IOControl::ioread( IOInfo* it )
 			int val = card->getAnalogChannel(it->subdev, it->channel, it->range, it->aref);
 
 			iolog3 << myname << "(iopoll): read AI "
-				  << " sid=" << it->si.id
-				  << " subdev=" << it->subdev
-				  << " chan=" << it->channel
-				  << " val=" << val
-				  << endl;
+				   << " sid=" << it->si.id
+				   << " subdev=" << it->subdev
+				   << " chan=" << it->channel
+				   << " val=" << val
+				   << endl;
 
 			IOBase::processingAsAI( ib, val, shm, force );
 		}
@@ -676,7 +677,7 @@ void IOControl::ioread( IOInfo* it )
 	catch( const CORBA::SystemException& ex )
 	{
 		iolog3 << myname << "(iopoll): СORBA::SystemException: "
-			  << ex.NP_minorString() << endl;
+			   << ex.NP_minorString() << endl;
 	}
 }
 // --------------------------------------------------------------------------------
@@ -729,9 +730,9 @@ bool IOControl::initIOItem( UniXML::iterator& it )
 	if( c.empty() || inf.ncard < 0 || inf.ncard >= (int)cards.size() )
 	{
 		iolog3 << myname
-			  << "(initIOItem): Unknown or bad card number ("
-			  << inf.ncard << ") for " << it.getProp("name")
-			  << " set default=" << defCardNum << endl;
+			   << "(initIOItem): Unknown or bad card number ("
+			   << inf.ncard << ") for " << it.getProp("name")
+			   << " set default=" << defCardNum << endl;
 		inf.ncard = defCardNum;
 	}
 
@@ -777,8 +778,8 @@ bool IOControl::initIOItem( UniXML::iterator& it )
 		IOPriority p(prior, maxItem);
 		pmap.push_back(p);
 		iolog3 << myname << "(readItem): add to priority list: " <<
-			  it.getProp("name")
-			  << " priority=" << prior << endl;
+			   it.getProp("name")
+			   << " priority=" << prior << endl;
 	}
 
 	// значит это пороговый датчик..
@@ -786,7 +787,7 @@ bool IOControl::initIOItem( UniXML::iterator& it )
 	{
 		iomap[maxItem++] = std::move(inf);
 		iolog3 << myname << "(readItem): add threshold '" << it.getProp("name")
-			  << " for '" << uniset_conf()->oind->getNameById(inf.t_ai) << endl;
+			   << " for '" << uniset_conf()->oind->getNameById(inf.t_ai) << endl;
 		return true;
 	}
 
@@ -795,7 +796,7 @@ bool IOControl::initIOItem( UniXML::iterator& it )
 	if( inf.channel < 0 || inf.channel > 32 )
 	{
 		iowarn << myname << "(readItem): Unknown channel: " << inf.channel
-			  << " for " << it.getProp("name") << endl;
+			   << " for " << it.getProp("name") << endl;
 		return false;
 	}
 
@@ -814,8 +815,8 @@ bool IOControl::initIOItem( UniXML::iterator& it )
 		if( inf.range < 0 || inf.range > 3 )
 		{
 			iocrit << myname << "(readItem): Unknown 'range': " << inf.range
-				  << " for " << it.getProp("name")
-				  << " Must be range=[0..3]" << endl;
+				   << " for " << it.getProp("name")
+				   << " Must be range=[0..3]" << endl;
 			return false;
 		}
 
@@ -824,8 +825,8 @@ bool IOControl::initIOItem( UniXML::iterator& it )
 		if( inf.aref < 0 || inf.aref > 3 )
 		{
 			iocrit << myname << "(readItem): Unknown 'aref': " << inf.aref
-				  << " for " << it.getProp("name")
-				  << ". Must be aref=[0..3]" << endl;
+				   << " for " << it.getProp("name")
+				   << ". Must be aref=[0..3]" << endl;
 			return false;
 		}
 	}
@@ -1389,7 +1390,7 @@ void IOControl::askSensors( UniversalIO::UIOCommand cmd )
 void IOControl::sensorInfo( const UniSetTypes::SensorMessage* sm )
 {
 	iolog1 << myname << "(sensorInfo): sm->id=" << sm->id
-		  << " val=" << sm->value << endl;
+		   << " val=" << sm->value << endl;
 
 	if( force_out )
 		return;
@@ -1410,8 +1411,8 @@ void IOControl::sensorInfo( const UniSetTypes::SensorMessage* sm )
 		if( it.si.id == sm->id )
 		{
 			ioinfo << myname << "(sensorInfo): sid=" << sm->id
-				  << " value=" << sm->value
-				  << endl;
+				   << " value=" << sm->value
+				   << endl;
 
 			if( it.stype == UniversalIO::AO )
 			{
@@ -1512,7 +1513,7 @@ void IOControl::sensorInfo( const UniSetTypes::SensorMessage* sm )
 			else if( it.stype == UniversalIO::DO )
 			{
 				iolog1 << myname << "(sensorInfo): DO: sm->id=" << sm->id
-					  << " val=" << sm->value << endl;
+					   << " val=" << sm->value << endl;
 
 				uniset_rwmutex_wrlock lock(it.val_lock);
 				it.value = sm->value ? 1 : 0;
@@ -1627,7 +1628,7 @@ void IOControl::buildCardsList()
 		{
 			cards[cardnum] = NULL;
 			iolog3 << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
-				  << " DISABLED! ignore=1" << endl;
+				   << " DISABLED! ignore=1" << endl;
 			continue;
 		}
 
@@ -1638,7 +1639,7 @@ void IOControl::buildCardsList()
 		{
 			cards[cardnum] = NULL;
 			iolog3 << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
-				  << " DISABLED! (" << s.str() << ")" << endl;
+				   << " DISABLED! (" << s.str() << ")" << endl;
 			continue;
 		}
 
@@ -1648,8 +1649,8 @@ void IOControl::buildCardsList()
 		{
 			cards[cardnum] = NULL;
 			iolog3 << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
-				  << " DISABLED! iodev='"
-				  << iodev << "'" << endl;
+				   << " DISABLED! iodev='"
+				   << iodev << "'" << endl;
 			continue;
 		}
 
@@ -1710,14 +1711,14 @@ void IOControl::buildCardsList()
 				{
 					// для Grayhill конфигурирование не требуется
 					ioinfo << myname << "(buildCardsList): card=" << it.getProp("card")
-						  << "(" << cname << ")"
-						  << " init subdev" << i << " 'GRAYHILL'" << endl;
+						   << "(" << cname << ")"
+						   << " init subdev" << i << " 'GRAYHILL'" << endl;
 					continue;
 				}
 
 				ioinfo << myname << "(buildCardsList): card=" << it.getProp("card")
-					  << "(" << cname << ")"
-					  << " init subdev" << i << " " << it.getProp(s.str()) << endl;
+					   << "(" << cname << ")"
+					   << " init subdev" << i << " " << it.getProp(s.str()) << endl;
 				cards[cardnum]->configureSubdev(i - 1, st);
 			}
 		}

extensions/IOControl/IOLogSugar.h

 #ifndef IOLogSugar_H_
 #define IOLogSugar_H_
-      // "синтаксический сахар"..для логов
-		#ifndef ioinfo
-			#define ioinfo if( iolog->debugging(Debug::INFO) ) iolog->info()
-        #endif
-		#ifndef iowarn
-			#define iowarn if( iolog->debugging(Debug::WARN) ) iolog->warn()
-        #endif
-		#ifndef iocrit
-			#define iocrit if( iolog->debugging(Debug::CRIT) ) iolog->crit()
-        #endif
-        #ifndef iolog1
-        	#define iolog1 if( iolog->debugging(Debug::LEVEL1) ) iolog->level1()
-        #endif
-        #ifndef iolog2
-	        #define iolog2 if( iolog->debugging(Debug::LEVEL2) ) iolog->level2()
-        #endif
-        #ifndef iolog3
-    	    #define iolog3 if( iolog->debugging(Debug::LEVEL3) ) iolog->level3()
-        #endif
-        #ifndef iolog4
-        	#define iolog4 if( iolog->debugging(Debug::LEVEL4) ) iolog->level4()
-        #endif
-        #ifndef iolog5
-	        #define iolog5 if( iolog->debugging(Debug::LEVEL5) ) iolog->level5()
-        #endif
-        #ifndef iolog6
-    	    #define iolog6 if( iolog->debugging(Debug::LEVEL6) ) iolog->level6()
-        #endif
-        #ifndef iolog7
-        	#define iolog7 if( iolog->debugging(Debug::LEVEL7) ) iolog->level7()
-        #endif
-        #ifndef iolog8
-	        #define iolog8 if( iolog->debugging(Debug::LEVEL8) ) iolog->level8()
-        #endif
-        #ifndef iolog9
-    	    #define iolog9 if( iolog->debugging(Debug::LEVEL9) ) iolog->level9()
-        #endif
-        #ifndef iologany
-        	#define iologany iolog->any()
-        #endif
+// "синтаксический сахар"..для логов
+#ifndef ioinfo
+#define ioinfo if( iolog->debugging(Debug::INFO) ) iolog->info()
+#endif
+#ifndef iowarn
+#define iowarn if( iolog->debugging(Debug::WARN) ) iolog->warn()
+#endif
+#ifndef iocrit
+#define iocrit if( iolog->debugging(Debug::CRIT) ) iolog->crit()
+#endif
+#ifndef iolog1
+#define iolog1 if( iolog->debugging(Debug::LEVEL1) ) iolog->level1()
+#endif
+#ifndef iolog2
+#define iolog2 if( iolog->debugging(Debug::LEVEL2) ) iolog->level2()
+#endif
+#ifndef iolog3
+#define iolog3 if( iolog->debugging(Debug::LEVEL3) ) iolog->level3()
+#endif
+#ifndef iolog4
+#define iolog4 if( iolog->debugging(Debug::LEVEL4) ) iolog->level4()
+#endif
+#ifndef iolog5
+#define iolog5 if( iolog->debugging(Debug::LEVEL5) ) iolog->level5()
+#endif
+#ifndef iolog6
+#define iolog6 if( iolog->debugging(Debug::LEVEL6) ) iolog->level6()
+#endif
+#ifndef iolog7
+#define iolog7 if( iolog->debugging(Debug::LEVEL7) ) iolog->level7()
+#endif
+#ifndef iolog8
+#define iolog8 if( iolog->debugging(Debug::LEVEL8) ) iolog->level8()
+#endif
+#ifndef iolog9
+#define iolog9 if( iolog->debugging(Debug::LEVEL9) ) iolog->level9()
+#endif
+#ifndef iologany
+#define iologany iolog->any()
+#endif
 #endif

extensions/ModbusMaster/MBExchange.cc

@@ -58,7 +58,8 @@ MBExchange::MBExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId
 	UniXML::iterator it(cnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", cnode );
+	logserv->init( prefix + "-logserver", cnode );
+
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
 		logserv_host = conf->getArg2Param("--" + prefix + "-logserver-host", it.getProp("logserverHost"), "localhost");

extensions/ModbusMaster/RTUExchange.cc

@@ -285,7 +285,7 @@ bool RTUExchange::poll()
 	updateSM();
 
 	// check thresholds
-	for( auto&& t : thrlist )
+	for( auto && t : thrlist )
 	{
 		if( !checkProcActive() )
 			return false;
@@ -358,7 +358,7 @@ bool RTUExchange::initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniX
 		{
 			d->second->speed = defSpeed;
 			mbcrit << myname << "(initDeviceInfo): Unknown speed=" << s <<
-				  " for addr=" << ModbusRTU::addr2str(a) << endl;
+				   " for addr=" << ModbusRTU::addr2str(a) << endl;
 			return false;
 		}
 	}

extensions/ModbusSlave/MBSlave.cc

@@ -57,7 +57,8 @@ MBSlave::MBSlave( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId, cons
 	UniXML::iterator it(cnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", cnode );
+	logserv->init( prefix + "-logserver", cnode );
+
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
 		logserv_host = conf->getArg2Param("--" + prefix + "-logserver-host", it.getProp("logserverHost"), "localhost");

extensions/ModbusSlave/MBTCPMultiSlave.cc

@@ -198,8 +198,8 @@ void MBTCPMultiSlave::execute_tcp()
 				auto c = it.second;
 
 				mblog4 << myname << "(work): " << c.iaddr << " resp=" << (c.invert ? c.ptTimeout.checkTime() : !c.ptTimeout.checkTime())
-					  << " askcount=" << c.askCount
-					  << endl;
+					   << " askcount=" << c.askCount
+					   << endl;
 
 
 				if( c.respond_s != DefaultObjectId )

extensions/RRDServer/RRDServer.cc

@@ -28,7 +28,8 @@ RRDServer::RRDServer( UniSetTypes::ObjectId objId, xmlNode* cnode, UniSetTypes::
 	UniXML::iterator it(cnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", cnode );
+	logserv->init( prefix + "-logserver", cnode );
+
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
 		logserv_host = conf->getArg2Param("--" + prefix + "-logserver-host", it.getProp("logserverHost"), "localhost");
@@ -330,7 +331,7 @@ void RRDServer::sysCommand( const UniSetTypes::SystemMessage* sm )
 			logserv->run(logserv_host, logserv_port, true);
 		}
 
-		for( auto&& it : rrdlist )
+		for( auto && it : rrdlist )
 		{
 			try
 			{

extensions/SharedMemory/SharedMemory.cc

@@ -68,11 +68,11 @@ SharedMemory::SharedMemory( ObjectId id, const std::string& datafile, const std:
 	if( confnode == NULL )
 		throw SystemError("Not found conf-node for " + cname );
 
-	string prefix="sm";
+	string prefix = "sm";
 
 	smlog = make_shared<DebugStream>();
 	smlog->setLogName(myname);
-	conf->initLogStream(smlog,prefix+"-log");
+	conf->initLogStream(smlog, prefix + "-log");
 
 	loga = make_shared<LogAgregator>();
 	loga->add(smlog);
@@ -82,7 +82,8 @@ SharedMemory::SharedMemory( ObjectId id, const std::string& datafile, const std:
 	UniXML::iterator it(confnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", confnode );
+	logserv->init( prefix + "-logserver", confnode );
+
 	// ----------------------
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
@@ -521,7 +522,7 @@ void SharedMemory::readEventList( const std::string& oname )
 		}
 		else
 			smcrit << myname << "(readEventList): Не найден ID для "
-				  << it.getProp("name") << endl;
+				   << it.getProp("name") << endl;
 	}
 }
 // -----------------------------------------------------------------------------
@@ -621,9 +622,9 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
 		if( hi.fuse_id == DefaultObjectId )
 		{
 			smwarn << myname << "(buildHistory): not found sensor ID for "
-				  << it.getProp("fuse_id")
-				  << " history item id=" << it.getProp("id")
-				  << " ..ignore.." << endl;
+				   << it.getProp("fuse_id")
+				   << " history item id=" << it.getProp("id")
+				   << " ..ignore.." << endl;
 			continue;
 		}
 
@@ -638,10 +639,10 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
 		}
 
 		sminfo << 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
-			  << endl;
+			   << " fuse_val=" << hi.fuse_val
+			   << " fuse_use_val=" << hi.fuse_use_val
+			   << " fuse_invert=" << hi.fuse_invert
+			   << endl;
 
 		// WARNING: no check duplicates...
 		hist.push_back(hi);
@@ -725,9 +726,9 @@ void SharedMemory::updateHistory( std::shared_ptr<USensorInfo>& s_it, IOControll
 	}
 
 	sminfo << myname << "(updateHistory): "
-		  << " sid=" << s_it->si.id
-		  << " value=" << value
-		  << endl;
+		   << " sid=" << s_it->si.id
+		   << " value=" << value
+		   << endl;
 
 	for( auto& it1 : i->second )
 	{

extensions/SharedMemory/SharedMemory.h

@@ -380,7 +380,7 @@ class SharedMemory:
 
 		virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
 		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override;
-		virtual void askSensors( UniversalIO::UIOCommand cmd ){};
+		virtual void askSensors( UniversalIO::UIOCommand cmd ) {};
 		void sendEvent( UniSetTypes::SystemMessage& sm );
 		void initFromReserv();
 		bool initFromSM( UniSetTypes::ObjectId sm_id, UniSetTypes::ObjectId sm_node );

extensions/UNetUDP/UNetExchange.cc

@@ -26,7 +26,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 
 	unetlog = make_shared<DebugStream>();
 	unetlog->setLogName(myname);
-	conf->initLogStream(unetlog,prefix+"-log");
+	conf->initLogStream(unetlog, prefix + "-log");
 
 	loga = make_shared<LogAgregator>();
 	loga->add(unetlog);
@@ -38,7 +38,8 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 	UniXML::iterator it(cnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", cnode );
+	logserv->init( prefix + "-logserver", cnode );
+
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
 		logserv_host = conf->getArg2Param("--" + prefix + "-logserver-host", it.getProp("logserverHost"), "localhost");
@@ -49,12 +50,12 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 	s_field = conf->getArgParam("--" + prefix + "-filter-field");
 	s_fvalue = conf->getArgParam("--" + prefix + "-filter-value");
 	unetinfo << myname << "(init): read filter-field='" << s_field
-		  << "' filter-value='" << s_fvalue << "'" << endl;
+			 << "' 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"));
 	unetinfo << myname << "(init): read nodes-filter-field='" << n_field
-		  << "' nodes-filter-value='" << n_fvalue << "'" << endl;
+			 << "' nodes-filter-value='" << n_fvalue << "'" << endl;
 
 	int recvTimeout = conf->getArgPInt("--" + prefix + "-recv-timeout", it.getProp("recvTimeout"), 5000);
 	int prepareTime = conf->getArgPInt("--" + prefix + "-preapre-time", it.getProp("prepareTime"), 2000);
@@ -68,7 +69,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 
 	no_sender = conf->getArgInt("--" + prefix + "-nosender", it.getProp("nosender"));
 
-	std::string nconfname = conf->getArg2Param("--" + prefix + "-nodes-confnode", it.getProp("nodesConfNode"),"nodes");
+	std::string nconfname = conf->getArg2Param("--" + prefix + "-nodes-confnode", it.getProp("nodesConfNode"), "nodes");
 
 	xmlNode* nodes = 0;
 
@@ -83,7 +84,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 	unetinfo << myname << "(init):  init from <" << nconfname << ">" << endl;
 
 	if( !nodes )
-		throw UniSetTypes::SystemError("(UNetExchange): Not found confnode <" + nconfname +">");
+		throw UniSetTypes::SystemError("(UNetExchange): Not found confnode <" + nconfname + ">");
 
 	UniXML::iterator n_it(nodes);
 
@@ -152,7 +153,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 			if( no_sender )
 			{
 				unetinfo << myname << "(init): sender OFF for this node...("
-					  << n_it.getProp("name") << ")" << endl;
+						 << n_it.getProp("name") << ")" << endl;
 				continue;
 			}
 
@@ -306,7 +307,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 		}
 
 		unetinfo << myname << "(init): (node='" << n << "') add receiver "
-			  << h2 << ":" << p2 << endl;
+				 << h2 << ":" << p2 << endl;
 		auto r = make_shared<UNetReceiver>(h, p, shm);
 
 		loga->add(r->getLog());
@@ -333,7 +334,7 @@ UNetExchange::UNetExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId s
 			if( !h2.empty() ) // создаём читателя впо второму каналу
 			{
 				unetinfo << myname << "(init): (node='" << n << "') add reserv receiver "
-					  << h2 << ":" << p2 << endl;
+						 << h2 << ":" << p2 << endl;
 
 				r2 = make_shared<UNetReceiver>(h2, p2, shm);
 
@@ -487,7 +488,7 @@ void UNetExchange::step()
 		}
 	}
 
-	for( auto&& it : recvlist )
+	for( auto && it : recvlist )
 		it.step(shm, myname, unetlog);
 }
 

extensions/UNetUDP/UNetLogSugar.h

 #ifndef UNETLogSugar_H_
 #define UNETLogSugar_H_
-      // "синтаксический сахар"..для логов
-		#ifndef unetinfo
-			#define unetinfo if( unetlog->debugging(Debug::INFO) ) unetlog->info()
-        #endif
-		#ifndef unetwarn
-			#define unetwarn if( unetlog->debugging(Debug::WARN) ) unetlog->warn()
-        #endif
-		#ifndef unetcrit
-			#define unetcrit if( unetlog->debugging(Debug::CRIT) ) unetlog->crit()
-        #endif
-        #ifndef unetlog1
-        	#define unetlog1 if( unetlog->debugging(Debug::LEVEL1) ) unetlog->level1()
-        #endif
-        #ifndef unetlog2
-	        #define unetlog2 if( unetlog->debugging(Debug::LEVEL2) ) unetlog->level2()
-        #endif
-        #ifndef unetlog3
-    	    #define unetlog3 if( unetlog->debugging(Debug::LEVEL3) ) unetlog->level3()
-        #endif
-        #ifndef unetlog4
-        	#define unetlog4 if( unetlog->debugging(Debug::LEVEL4) ) unetlog->level4()
-        #endif
-        #ifndef unetlog5
-	        #define unetlog5 if( unetlog->debugging(Debug::LEVEL5) ) unetlog->level5()
-        #endif
-        #ifndef unetlog6
-    	    #define unetlog6 if( unetlog->debugging(Debug::LEVEL6) ) unetlog->level6()
-        #endif
-        #ifndef unetlog7
-        	#define unetlog7 if( unetlog->debugging(Debug::LEVEL7) ) unetlog->level7()
-        #endif
-        #ifndef unetlog8
-	        #define unetlog8 if( unetlog->debugging(Debug::LEVEL8) ) unetlog->level8()
-        #endif
-        #ifndef unetlog9
-    	    #define unetlog9 if( unetlog->debugging(Debug::LEVEL9) ) unetlog->level9()
-        #endif
-        #ifndef unetlogany
-        	#define unetlogany unetlog->any()
-        #endif
+// "синтаксический сахар"..для логов
+#ifndef unetinfo
+#define unetinfo if( unetlog->debugging(Debug::INFO) ) unetlog->info()
+#endif
+#ifndef unetwarn
+#define unetwarn if( unetlog->debugging(Debug::WARN) ) unetlog->warn()
+#endif
+#ifndef unetcrit
+#define unetcrit if( unetlog->debugging(Debug::CRIT) ) unetlog->crit()
+#endif
+#ifndef unetlog1
+#define unetlog1 if( unetlog->debugging(Debug::LEVEL1) ) unetlog->level1()
+#endif
+#ifndef unetlog2
+#define unetlog2 if( unetlog->debugging(Debug::LEVEL2) ) unetlog->level2()
+#endif
+#ifndef unetlog3
+#define unetlog3 if( unetlog->debugging(Debug::LEVEL3) ) unetlog->level3()
+#endif
+#ifndef unetlog4
+#define unetlog4 if( unetlog->debugging(Debug::LEVEL4) ) unetlog->level4()
+#endif
+#ifndef unetlog5
+#define unetlog5 if( unetlog->debugging(Debug::LEVEL5) ) unetlog->level5()
+#endif
+#ifndef unetlog6
+#define unetlog6 if( unetlog->debugging(Debug::LEVEL6) ) unetlog->level6()
+#endif
+#ifndef unetlog7
+#define unetlog7 if( unetlog->debugging(Debug::LEVEL7) ) unetlog->level7()
+#endif
+#ifndef unetlog8
+#define unetlog8 if( unetlog->debugging(Debug::LEVEL8) ) unetlog->level8()
+#endif
+#ifndef unetlog9
+#define unetlog9 if( unetlog->debugging(Debug::LEVEL9) ) unetlog->level9()
+#endif
+#ifndef unetlogany
+#define unetlogany unetlog->any()
+#endif
 #endif // end of UNETLogSugar

extensions/UNetUDP/UNetReceiver.h

@@ -119,7 +119,10 @@ class UNetReceiver:
 		typedef sigc::slot<void, const std::shared_ptr<UNetReceiver>&, Event> EventSlot;
 		void connectEvent( EventSlot sl );
 
-		inline std::shared_ptr<DebugStream> getLog(){ return unetlog; }
+		inline std::shared_ptr<DebugStream> getLog()
+		{
+			return unetlog;
+		}
 
 	protected:
 

extensions/UNetUDP/UNetSender.cc

@@ -37,7 +37,7 @@ UNetSender::UNetSender( const std::string& s_host, const ost::tpport_t port, con
 	//    s_field = conf->getArgParam("--udp-filter-field");
 	//    s_fvalue = conf->getArgParam("--udp-filter-value");
 	unetinfo << myname << "(init): read filter-field='" << s_field
-		  << "' filter-value='" << s_fvalue << "'" << endl;
+			 << "' filter-value='" << s_fvalue << "'" << endl;
 
 	unetinfo << "(UNetSender): UDP set to " << s_host << ":" << port << endl;
 
@@ -295,7 +295,7 @@ bool UNetSender::initItem( UniXML::iterator& it )
 	if( sid == DefaultObjectId )
 	{
 		unetcrit << myname << "(readItem): ID not found for "
-			  << sname << endl;
+				 << sname << endl;
 		return false;
 	}
 
@@ -317,8 +317,8 @@ bool UNetSender::initItem( UniXML::iterator& it )
 		if ( p.pack_ind >= UniSetUDP::MaxDCount )
 		{
 			unetcrit << myname
-				  << "(readItem): OVERFLOW! MAX UDP DIGITAL DATA LIMIT! max="
-				  << UniSetUDP::MaxDCount << endl;
+					 << "(readItem): OVERFLOW! MAX UDP DIGITAL DATA LIMIT! max="
+					 << UniSetUDP::MaxDCount << endl;
 
 			raise(SIGTERM);
 			return false;
@@ -331,8 +331,8 @@ bool UNetSender::initItem( UniXML::iterator& it )
 		if ( p.pack_ind >= UniSetUDP::MaxACount )
 		{
 			unetcrit << myname
-				  << "(readItem): OVERFLOW! MAX UDP ANALOG DATA LIMIT! max="
-				  << UniSetUDP::MaxACount << endl;
+					 << "(readItem): OVERFLOW! MAX UDP ANALOG DATA LIMIT! max="
+					 << UniSetUDP::MaxACount << endl;
 			raise(SIGTERM);
 			return false;
 		}

extensions/UNetUDP/UNetSender.h

@@ -70,7 +70,10 @@ class UNetSender
 		/*! инициализация  итераторов */
 		void initIterators();
 
-		inline std::shared_ptr<DebugStream> getLog(){ return unetlog; }
+		inline std::shared_ptr<DebugStream> getLog()
+		{
+			return unetlog;
+		}
 
 	protected:
 

extensions/tests/sm_perf_test.cc

@@ -47,7 +47,7 @@ void run_test(std::size_t concurrency, int bound, shared_ptr<SharedMemory>& shm
 	auto&& r_worker = [&shm, bound]
 	{
 		int num = bound;
-		ObjectId sid = begSensorID + rand()%10000;
+		ObjectId sid = begSensorID + rand() % 10000;
 
 		while (num--)
 		{
@@ -58,7 +58,7 @@ void run_test(std::size_t concurrency, int bound, shared_ptr<SharedMemory>& shm
 	auto&& w_worker = [&shm, bound]
 	{
 		int num = bound;
-		ObjectId sid = begSensorID + rand()%10000;
+		ObjectId sid = begSensorID + rand() % 10000;
 
 		while (num--)
 		{
@@ -68,10 +68,10 @@ void run_test(std::size_t concurrency, int bound, shared_ptr<SharedMemory>& shm
 
 	std::vector<std::thread> threads;
 
-	for (std::size_t i = 0; i < concurrency/2 - 1; ++i)
+	for (std::size_t i = 0; i < concurrency / 2 - 1; ++i)
 		threads.emplace_back(r_worker);
 
-	for (std::size_t i = 0; i < concurrency/2 - 1; ++i)
+	for (std::size_t i = 0; i < concurrency / 2 - 1; ++i)
 		threads.emplace_back(w_worker);
 
 	for (auto && thread : threads)
@@ -112,8 +112,8 @@ int main(int argc, char* argv[] )
 		start = std::chrono::system_clock::now();
 		run_test(50, 1000000, shm);
 		end = std::chrono::system_clock::now();
- 
-		int elapsed_seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end-start).count();
+
+		int elapsed_seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
 		std::cout << "elapsed time: " << elapsed_seconds << " ms\n";
 		return 0;
 	}

include/DBLogSugar.h

 #ifndef DBLogSugar_H_
 #define DBLogSugar_H_
-      // "синтаксический сахар"..для логов
-		#ifndef dbinfo
-			#define dbinfo if( dblog->debugging(Debug::INFO) ) dblog->info()
-        #endif
-		#ifndef dbwarn
-			#define dbwarn if( dblog->debugging(Debug::WARN) ) dblog->warn()
-        #endif
-		#ifndef dbcrit
-			#define dbcrit if( dblog->debugging(Debug::CRIT) ) dblog->crit()
-        #endif
-        #ifndef dblog1
-        	#define dblog1 if( dblog->debugging(Debug::LEVEL1) ) dblog->level1()
-        #endif
-        #ifndef dblog2
-	        #define dblog2 if( dblog->debugging(Debug::LEVEL2) ) dblog->level2()
-        #endif
-        #ifndef dblog3
-    	    #define dblog3 if( dblog->debugging(Debug::LEVEL3) ) dblog->level3()
-        #endif
-        #ifndef dblog4
-        	#define dblog4 if( dblog->debugging(Debug::LEVEL4) ) dblog->level4()
-        #endif
-        #ifndef dblog5
-	        #define dblog5 if( dblog->debugging(Debug::LEVEL5) ) dblog->level5()
-        #endif
-        #ifndef dblog6
-    	    #define dblog6 if( dblog->debugging(Debug::LEVEL6) ) dblog->level6()
-        #endif
-        #ifndef dblog7
-        	#define dblog7 if( dblog->debugging(Debug::LEVEL7) ) dblog->level7()
-        #endif
-        #ifndef dblog8
-	        #define dblog8 if( dblog->debugging(Debug::LEVEL8) ) dblog->level8()
-        #endif
-        #ifndef dblog9
-    	    #define dblog9 if( dblog->debugging(Debug::LEVEL9) ) dblog->level9()
-        #endif
-        #ifndef dblogany
-        	#define dblogany dblog->any()
-        #endif
+// "синтаксический сахар"..для логов
+#ifndef dbinfo
+#define dbinfo if( dblog->debugging(Debug::INFO) ) dblog->info()
+#endif
+#ifndef dbwarn
+#define dbwarn if( dblog->debugging(Debug::WARN) ) dblog->warn()
+#endif
+#ifndef dbcrit
+#define dbcrit if( dblog->debugging(Debug::CRIT) ) dblog->crit()
+#endif
+#ifndef dblog1
+#define dblog1 if( dblog->debugging(Debug::LEVEL1) ) dblog->level1()
+#endif
+#ifndef dblog2
+#define dblog2 if( dblog->debugging(Debug::LEVEL2) ) dblog->level2()
+#endif
+#ifndef dblog3
+#define dblog3 if( dblog->debugging(Debug::LEVEL3) ) dblog->level3()
+#endif
+#ifndef dblog4
+#define dblog4 if( dblog->debugging(Debug::LEVEL4) ) dblog->level4()
+#endif
+#ifndef dblog5
+#define dblog5 if( dblog->debugging(Debug::LEVEL5) ) dblog->level5()
+#endif
+#ifndef dblog6
+#define dblog6 if( dblog->debugging(Debug::LEVEL6) ) dblog->level6()
+#endif
+#ifndef dblog7
+#define dblog7 if( dblog->debugging(Debug::LEVEL7) ) dblog->level7()
+#endif
+#ifndef dblog8
+#define dblog8 if( dblog->debugging(Debug::LEVEL8) ) dblog->level8()
+#endif
+#ifndef dblog9
+#define dblog9 if( dblog->debugging(Debug::LEVEL9) ) dblog->level9()
+#endif
+#ifndef dblogany
+#define dblogany dblog->any()
+#endif
 #endif // end of DBLogSugar

include/DBServer.h

@@ -53,8 +53,8 @@ class DBServer:
 	public UniSetObject_LT
 {
 	public:
-		DBServer( UniSetTypes::ObjectId id, const std::string& prefix="db" );
-		DBServer( const std::string& prefix="db" );
+		DBServer( UniSetTypes::ObjectId id, const std::string& prefix = "db" );
+		DBServer( const std::string& prefix = "db" );
 		~DBServer();
 
 		static std::string help_print();
@@ -66,7 +66,7 @@ class DBServer:
 		virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg ) {}
 
 		virtual bool activateObject() override;
-		virtual void initDBServer(){};
+		virtual void initDBServer() {};
 
 
 		std::shared_ptr<LogAgregator> loga;

include/LogServer.h

@@ -87,7 +87,7 @@ class LogServer
 			return (thr && thr->isRunning());
 		}
 
-		void init( const std::string& prefix, xmlNode* cnode=0 );
+		void init( const std::string& prefix, xmlNode* cnode = 0 );
 
 		static std::string help_print( const std::string& prefix );
 

include/modbus/MBLogSugar.h

 #ifndef MBLogSugar_H_
 #define MBLogSugar_H_
-      // "синтаксический сахар"..для логов
-		#ifndef mbinfo
-			#define mbinfo if( mblog->debugging(Debug::INFO) ) mblog->info()
-        #endif
-		#ifndef mbwarn
-			#define mbwarn if( mblog->debugging(Debug::WARN) ) mblog->warn()
-        #endif
-		#ifndef mbcrit
-			#define mbcrit if( mblog->debugging(Debug::CRIT) ) mblog->crit()
-        #endif
-        #ifndef mblog1
-        	#define mblog1 if( mblog->debugging(Debug::LEVEL1) ) mblog->level1()
-        #endif
-        #ifndef mblog2
-	        #define mblog2 if( mblog->debugging(Debug::LEVEL2) ) mblog->level2()
-        #endif
-        #ifndef mblog3
-    	    #define mblog3 if( mblog->debugging(Debug::LEVEL3) ) mblog->level3()
-        #endif
-        #ifndef mblog4
-        	#define mblog4 if( mblog->debugging(Debug::LEVEL4) ) mblog->level4()
-        #endif
-        #ifndef mblog5
-	        #define mblog5 if( mblog->debugging(Debug::LEVEL5) ) mblog->level5()
-        #endif
-        #ifndef mblog6
-    	    #define mblog6 if( mblog->debugging(Debug::LEVEL6) ) mblog->level6()
-        #endif
-        #ifndef mblog7
-        	#define mblog7 if( mblog->debugging(Debug::LEVEL7) ) mblog->level7()
-        #endif
-        #ifndef mblog8
-	        #define mblog8 if( mblog->debugging(Debug::LEVEL8) ) mblog->level8()
-        #endif
-        #ifndef mblog9
-    	    #define mblog9 if( mblog->debugging(Debug::LEVEL9) ) mblog->level9()
-        #endif
-        #ifndef mblogany
-        	#define mblogany mblog->any()
-        #endif
+// "синтаксический сахар"..для логов
+#ifndef mbinfo
+#define mbinfo if( mblog->debugging(Debug::INFO) ) mblog->info()
+#endif
+#ifndef mbwarn
+#define mbwarn if( mblog->debugging(Debug::WARN) ) mblog->warn()
+#endif
+#ifndef mbcrit
+#define mbcrit if( mblog->debugging(Debug::CRIT) ) mblog->crit()
+#endif
+#ifndef mblog1
+#define mblog1 if( mblog->debugging(Debug::LEVEL1) ) mblog->level1()
+#endif
+#ifndef mblog2
+#define mblog2 if( mblog->debugging(Debug::LEVEL2) ) mblog->level2()
+#endif
+#ifndef mblog3
+#define mblog3 if( mblog->debugging(Debug::LEVEL3) ) mblog->level3()
+#endif
+#ifndef mblog4
+#define mblog4 if( mblog->debugging(Debug::LEVEL4) ) mblog->level4()
+#endif
+#ifndef mblog5
+#define mblog5 if( mblog->debugging(Debug::LEVEL5) ) mblog->level5()
+#endif
+#ifndef mblog6
+#define mblog6 if( mblog->debugging(Debug::LEVEL6) ) mblog->level6()
+#endif
+#ifndef mblog7
+#define mblog7 if( mblog->debugging(Debug::LEVEL7) ) mblog->level7()
+#endif
+#ifndef mblog8
+#define mblog8 if( mblog->debugging(Debug::LEVEL8) ) mblog->level8()
+#endif
+#ifndef mblog9
+#define mblog9 if( mblog->debugging(Debug::LEVEL9) ) mblog->level9()
+#endif
+#ifndef mblogany
+#define mblogany mblog->any()
+#endif
 #endif

src/Log/LogAgregator.cc

@@ -16,7 +16,7 @@ LogAgregator::LogAgregator( Debug::type t ):
 // -------------------------------------------------------------------------
 void LogAgregator::logFile( const std::string& f, bool truncate )
 {
-	DebugStream::logFile(f,truncate);
+	DebugStream::logFile(f, truncate);
 
 	if( !f.empty() )
 		delete rdbuf(new teebuf(&internal->fbuf, &internal->sbuf));

src/Log/LogServer.cc

@@ -13,6 +13,7 @@ LogServer::~LogServer()
 {
 	if( nullsess )
 		nullsess->cancel();
+
 	{
 		// uniset_rwmutex_wrlock l(mutSList);
 		for( const auto& i : slist )
@@ -123,6 +124,7 @@ void LogServer::work()
 			while( !cancelled && tcp->isPendingConnection(timeout) )
 			{
 				if( cancelled ) break;
+
 				{
 					uniset_rwmutex_wrlock l(mutSList);
 					int sz = slist.size();

src/Services/DBServer.cc

@@ -58,7 +58,7 @@ DBServer::DBServer( ObjectId id, const std::string& prefix ):
 
 	dblog = make_shared<DebugStream>();
 	dblog->setLogName(myname);
-	conf->initLogStream(dblog,prefix+"-log");
+	conf->initLogStream(dblog, prefix + "-log");
 
 	loga = make_shared<LogAgregator>();
 	loga->add(dblog);
@@ -69,7 +69,8 @@ DBServer::DBServer( ObjectId id, const std::string& prefix ):
 	UniXML::iterator it(cnode);
 
 	logserv = make_shared<LogServer>(loga);
-	logserv->init( prefix+"-logserver", cnode );
+	logserv->init( prefix + "-logserver", cnode );
+
 	if( findArgParam("--" + prefix + "-run-logserver", conf->getArgc(), conf->getArgv()) != -1 )
 	{
 		logserv_host = conf->getArg2Param("--" + prefix + "-logserver-host", it.getProp("logserverHost"), "localhost");
@@ -111,9 +112,10 @@ bool DBServer::activateObject()
 void DBServer::sysCommand( const UniSetTypes::SystemMessage* sm )
 {
 	UniSetObject_LT::sysCommand(sm);
+
 	if(  sm->command == SystemMessage::StartUp )
 	{
-	if( !logserv_host.empty() && logserv_port != 0 && !logserv->isRunning() )
+		if( !logserv_host.empty() && logserv_port != 0 && !logserv->isRunning() )
 		{
 			dbinfo << myname << "(init): run log server " << logserv_host << ":" << logserv_port << endl;
 			logserv->run(logserv_host, logserv_port, true);