Перенёс испрвления из другой рабочей ветки.

Utilities/codegen/ctl-cpp-common.xsl

@@ -1259,9 +1259,9 @@ end_private(false)
 	if( smTestID == DefaultObjectId )
 		smTestID = getSMTestID();
 
-	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 40000);
+	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 90000);
 
-	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 30000);
+	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 50000);
 	ptStartUpTimeout.setTiming(msec);
 
 	// ===================== <variables> =====================
@@ -1730,9 +1730,9 @@ askPause(uniset_conf()->getPIntProp(cnode,"askPause",2000))
 	vmonit(smReadyTimeout);
 	vmonit(activateTimeout);
 
-	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 40000);
+	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 90000);
 
-	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 30000);
+	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 60000);
 	ptStartUpTimeout.setTiming(msec);
 }
 

extensions/include/UObject_SK.h

@@ -8,7 +8,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2016-12-01+03:00
+// generate timestamp: 2016-12-12+03:00
 // -----------------------------------------------------------------------------
 #ifndef UObject_SK_H_
 #define UObject_SK_H_
@@ -29,7 +29,7 @@ class UObject_SK:
 	public uniset::UniSetObject
 {
 	public:
-		UObject_SK( uniset::ObjectId id, xmlNode* node = uniset::uniset_conf()->getNode("UObject"), const std::string& argprefix = "" );
+		UObject_SK( uniset::ObjectId id, xmlNode* node=uniset::uniset_conf()->getNode("UObject"), const std::string& argprefix="" );
 		UObject_SK();
 		virtual ~UObject_SK();
 
@@ -43,60 +43,54 @@ class UObject_SK:
 
 		virtual bool setMsg( uniset::ObjectId code, bool state = true ) noexcept;
 
-		inline std::shared_ptr<DebugStream> log() noexcept
-		{
-			return mylog;
-		}
-		inline std::shared_ptr<uniset::LogAgregator> logAgregator() noexcept
-		{
-			return loga;
-		}
+		inline std::shared_ptr<DebugStream> log() noexcept { return mylog; }
+		inline std::shared_ptr<uniset::LogAgregator> logAgregator() noexcept { return loga; }
 
 		void init_dlog( std::shared_ptr<DebugStream> d ) noexcept;
 
         // "синтаксический сахар"..для логов
-#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
-#ifndef vmonit
-#define vmonit( var ) vmon.add( #var, var )
-#endif
+        #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
+        #ifndef vmonit
+            #define vmonit( var ) vmon.add( #var, var )
+        #endif
         
         // Вспомогательные функции для удобства логирования
         // ------------------------------------------------------------
@@ -113,19 +107,16 @@ class UObject_SK:
            \param id           - идентификатор датчика
            \param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
         */
-		std::string str( uniset::ObjectId id, bool showLinkName = true ) const;
+        std::string str( uniset::ObjectId id, bool showLinkName=true ) const;
         
         /*! Вывод значения входа/выхода в формате: in_xxx(SensorName)=val 
            \param id           - идентификатор датчика
            \param showLinkName - TRUE - выводить SensorName, FALSE - не выводить
         */
-		std::string strval( uniset::ObjectId id, bool showLinkName = true ) const;
+        std::string strval( uniset::ObjectId id, bool showLinkName=true ) const;        
         
         /*! Вывод состояния внутренних переменных */
-		inline std::string dumpVars()
-		{
-			return std::move(vmon.pretty_str());
-		}
+        inline std::string dumpVars(){ return std::move(vmon.pretty_str()); }
         // ------------------------------------------------------------
         std::string help() noexcept;
 
@@ -161,25 +152,22 @@ class UObject_SK:
 		
 		virtual void callback() noexcept override;
 		virtual void processingMessage( const uniset::VoidMessage* msg ) override;
-		virtual void sysCommand( const uniset::SystemMessage* sm ) {};
-		virtual void askSensors( UniversalIO::UIOCommand cmd ) {}
-		virtual void sensorInfo( const uniset::SensorMessage* sm ) override {}
-		virtual void timerInfo( const uniset::TimerMessage* tm ) override {}
+		virtual void sysCommand( const uniset::SystemMessage* sm ){};
+		virtual void askSensors( UniversalIO::UIOCommand cmd ){}
+		virtual void sensorInfo( const uniset::SensorMessage* sm ) override{}
+		virtual void timerInfo( const uniset::TimerMessage* tm ) override{}
 		virtual void sigterm( int signo ) override;
 		virtual bool activateObject() override;
-		virtual std::string getMonitInfo()
-		{
-			return "";    /*!< пользовательская информация выводимая в getInfo() */
-		}
+		virtual std::string getMonitInfo(){ return ""; } /*!< пользовательская информация выводимая в getInfo() */
 
 #ifndef DISABLE_REST_API
-		virtual void httpGetUserData( Poco::JSON::Object::Ptr& jdata ) {} /*!<  для пользовательских данных в httpGet() */
+		virtual void httpGetUserData( Poco::JSON::Object::Ptr& jdata ){} /*!<  для пользовательских данных в httpGet() */
         virtual Poco::JSON::Object::Ptr httpDumpIO();
         virtual Poco::JSON::Object::Ptr httpRequestLog( const Poco::URI::QueryParameters& p );
 #endif
 
         // Выполнение очередного шага программы
-		virtual void step() {}
+		virtual void step(){}
 
 		void preAskSensors( UniversalIO::UIOCommand cmd );
 		void preSysCommand( const uniset::SystemMessage* sm );
@@ -208,15 +196,9 @@ class UObject_SK:
 		
 		xmlNode* confnode;
 		/*! получить числовое свойство из конф. файла по привязанной confnode */
-		int getIntProp(const std::string& name)
-		{
-			return uniset::uniset_conf()->getIntProp(confnode, name);
-		}
+		int getIntProp(const std::string& name) { return uniset::uniset_conf()->getIntProp(confnode, name); }
 		/*! получить текстовое свойство из конф. файла по привязанной confnode */
-		inline const std::string getProp(const std::string& name)
-		{
-			return uniset::uniset_conf()->getProp(confnode, name);
-		}
+		inline const std::string getProp(const std::string& name) { return uniset::uniset_conf()->getProp(confnode, name); }
 
 		uniset::timeout_t smReadyTimeout; 	/*!< время ожидания готовности SM */
 		std::atomic_bool activated;
@@ -267,9 +249,11 @@ class UObject_SK:
 			}
 		};
 		
-		std::unordered_map<const uniset::ObjectId, size_t, StatHashFn> smStat; /*!< количество сообщений по датчикам */
+		std::unordered_map<const uniset::ObjectId,size_t, StatHashFn> smStat; /*!< количество сообщений по датчикам */
 		size_t processingMessageCatchCount = { 0 }; /*!< количество исключений пойманных в processingMessage */
 		
+		std::string ostate = { "" }; /*!< состояние процесса (выводится в getInfo()) */
+		
 
 		bool end_private; // вспомогательное поле (для внутреннего использования при генерировании кода)
 };

extensions/lib/Makefile.am

@@ -8,4 +8,9 @@ libUniSet2Extensions_la_LIBADD   = $(SIGC_LIBS) $(POCO_LIBS) $(top_builddir)/lib
 libUniSet2Extensions_la_SOURCES  = Extensions.cc SMInterface.cc Calibration.cc SingleProcess.cc \
 	IOBase.cc DigitalFilter.cc PID.cc MTR.cc VTypes.cc UObject_SK.cc
 
+UObject_SK.cc: $(top_builddir)/Utilities/codegen/*.xsl
+	$(SHEL) $(top_builddir)/Utilities/codegen/uniset2-codegen -l $(top_builddir)/Utilities/codegen -n UObject --no-main $(top_builddir)/Utilities/codegen/tests/uobject.src.xml
+	mv -f UObject_SK.h ../include/
+
 include $(top_builddir)/include.mk
+

extensions/lib/UObject_SK.cc

@@ -11,7 +11,7 @@
  ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
 */ 
 // --------------------------------------------------------------------------
-// generate timestamp: 2016-12-01+03:00
+// generate timestamp: 2016-12-12+03:00
 // -----------------------------------------------------------------------------
 #include <memory>
 #include <iomanip>
@@ -32,28 +32,28 @@ using namespace uniset;
 
 // -----------------------------------------------------------------------------
 UObject_SK::UObject_SK():
-	// Инициализация идентификаторов (имена берутся из конф. файла)
+// Инициализация идентификаторов (имена берутся из конф. файла)
 
-	// Используемые идентификаторы сообщений (имена берутся из конф. файла)
+// Используемые идентификаторы сообщений (имена берутся из конф. файла)
 
-	// variables (public and proteced)
+// variables (public and proteced)
 
-	// ------------------
-	active(false),
+// ------------------
+active(false),
 
-	idHeartBeat(DefaultObjectId),
-	maxHeartBeat(10),
-	confnode(0),
-	smReadyTimeout(0),
-	activated(false),
-	askPause(2000),
-	forceOut(false),
-	// private variables
+idHeartBeat(DefaultObjectId),
+maxHeartBeat(10),
+confnode(0),
+smReadyTimeout(0),
+activated(false),
+askPause(2000),
+forceOut(false),
+// private variables
 
-	end_private(false)
+end_private(false)
 {
 	mycrit << "UObject: init failed!!!!!!!!!!!!!!!" << endl;
-	throw uniset::Exception( string(myname + ": init failed!!!") );
+	throw uniset::Exception( string(myname+": init failed!!!") );
 }
 // -----------------------------------------------------------------------------
 // ( val, confval, default val )
@@ -61,7 +61,6 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
 {
 	if( !s1.empty() )
 		return s1;
-
 	if( !s2.empty() )
 		return s2;
 	
@@ -75,41 +74,41 @@ static uniset::ObjectId init_node( xmlNode* cnode, const std::string& prop )
 	
 	auto conf = uniset_conf();
 	
-	if( conf->getProp(cnode, prop).empty() )
+	if( conf->getProp(cnode,prop).empty() )
 		return conf->getLocalNode();
 
-	return conf->getNodeID(conf->getProp(cnode, prop));
+	return conf->getNodeID(conf->getProp(cnode,prop));
 }
 // -----------------------------------------------------------------------------
 UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argprefix ):
-	UniSetObject(id),
-	// Инициализация идентификаторов (имена берутся из конф. файла)
+UniSetObject(id),
+// Инициализация идентификаторов (имена берутся из конф. файла)
 
-	// Используемые идентификаторы сообщений (имена берутся из конф. файла)
+// Используемые идентификаторы сообщений (имена берутся из конф. файла)
 
-	// variables
+// variables
 
-	sleep_msec(150),
-	active(true),
-	argprefix( (_argprefix.empty() ? myname + "-" : _argprefix) ),
+sleep_msec(150),
+active(true),
+argprefix( (_argprefix.empty() ? myname+"-" : _argprefix) ),
 
-	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( uniset::findArgParam("--print-id-list", uniset_conf()->getArgc(), uniset_conf()->getArgv()) != -1 )
+	if( uniset::findArgParam("--print-id-list",uniset_conf()->getArgc(),uniset_conf()->getArgv()) != -1 )
 	{
 
-		//		abort();
+//		abort();
 	}
 
 
@@ -125,10 +124,10 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	{
 		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());
 
@@ -146,14 +145,12 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 		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;
@@ -161,14 +158,13 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 			throw uniset::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);
 	}
 
 	// Инициализация значений
@@ -177,18 +173,16 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	si.id = uniset::DefaultObjectId;
 	si.node = conf->getLocalNode();
 	
-	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);
 
-	int sm_tout = conf->getArgInt("--" + argprefix + "sm-ready-timeout", "");
-
+	int sm_tout = conf->getArgInt("--" + argprefix + "sm-ready-timeout","");
 	if( sm_tout == 0 )
 		smReadyTimeout = 60000;
 	else if( sm_tout < 0 )
@@ -196,15 +190,15 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	else
 		smReadyTimeout = sm_tout;
 
-	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"),""));
 	
 
 	if( smTestID == DefaultObjectId )
 		smTestID = getSMTestID();
 
-	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 20000);
+	activateTimeout	= conf->getArgPInt("--" + argprefix + "activate-timeout", 90000);
 
-	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 10000);
+	int msec = conf->getArgPInt("--" + argprefix + "startup-timeout", 50000);
 	ptStartUpTimeout.setTiming(msec);
 
 	// ===================== <variables> =====================
@@ -223,7 +217,7 @@ UObject_SK::UObject_SK( ObjectId id, xmlNode* cnode, const std::string& _argpref
 	
 
 	// help надо выводить в конце, когда уже все переменные инициализированы по умолчанию
-	if( uniset::findArgParam("--" + argprefix + "help", uniset_conf()->getArgc(), uniset_conf()->getArgv()) != -1 )
+	if( uniset::findArgParam("--" + argprefix + "help",uniset_conf()->getArgc(),uniset_conf()->getArgv()) != -1 )
 		cout << help() << endl;
 }
 
@@ -275,7 +269,7 @@ bool UObject_SK::setMsg( uniset::ObjectId _code, bool _state ) noexcept
 void UObject_SK::resetMsg()
 {
     mylog8 << myname << "(resetMsg): reset messages.." << endl;
-	// reset messages
+// reset messages
 
 }
 // -----------------------------------------------------------------------------
@@ -304,11 +298,11 @@ Poco::JSON::Object::Ptr UObject_SK::httpDumpIO()
 {
 	Poco::JSON::Object::Ptr jdata = new Poco::JSON::Object();
 
-	Poco::JSON::Object::Ptr j_in = uniset::json::make_child(jdata, "in");
+	Poco::JSON::Object::Ptr j_in = uniset::json::make_child(jdata,"in");
 
 	
 	
-	Poco::JSON::Object::Ptr j_out = uniset::json::make_child(jdata, "out");
+	Poco::JSON::Object::Ptr j_out = uniset::json::make_child(jdata,"out");
 
 	
 
@@ -333,23 +327,19 @@ std::string  UObject_SK::dumpIO()
 	s << endl;
 
 	int n = 0;
-
-	for( const auto& e : v_in )
+	for( const auto& e: v_in )
 	{
 		s << e;
-
-		if( (n++) % 2 )
+		if( (n++)%2 )
 			s << std::endl;
 	}
 	
 	s << endl;
 	n = 0;
-
-	for( const auto& e : v_out )
+	for( const auto& e: v_out )
 	{
 		s << e;
-
-		if( (n++) % 2 )
+		if( (n++)%2 )
 			s << std::endl;
 	}
 	
@@ -422,31 +412,49 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
 	{
 		case SystemMessage::WatchDog:
 			myinfo << myname << "(preSysCommand): WatchDog" << endl;
-
 			if( !active || !ptStartUpTimeout.checkTime() )
 			{
 				mywarn << myname << "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" << endl;
 				break;
 			}
-
 		case SystemMessage::StartUp:
 		{
+			ostate = "StartUp...";
+			try
+			{
 				if( !logserv_host.empty() && logserv_port != 0 && !logserv->isRunning() )
 				{
+					ostate = "StartUp: run log server...";
 					myinfo << myname << "(preSysCommand): run log server " << logserv_host << ":" << logserv_port << endl;
 					logserv->run(logserv_host, logserv_port, true);
 				}
+			}
+			catch( std::exception& ex )
+			{
+				mywarn << myname << "(preSysCommand): CAN`t run log server err: " << ex.what() << endl;
+			}
+			catch( ... )
+			{
+				mywarn << myname << "(preSysCommand): CAN`t run log server err: catch ..." << endl;
+			}
 
+			ostate = "StartUp: wait sm ready..";
 			waitSM(smReadyTimeout);
 			ptStartUpTimeout.reset();
 			// т.к. для io-переменных важно соблюдать последовательность!
 			// сперва обновить входы..
+			ostate = "StartUp: update values..";
 			updateValues();
+			ostate = "StartUp: init from SM..";
 			initFromSM(); // потом обновить значения переменных, помеченных как инициализируемые из SM
+			ostate = "StartUp: update outputs..";
 			updateOutputs(true); // а потом уже выходы (принудительное обновление)
+			ostate = "StartUp: pre ask sensors..";
 			preAskSensors(UniversalIO::UIONotify);
+			ostate = "StartUp: ask sensors..";
 			askSensors(UniversalIO::UIONotify);
 			active = true;
+			ostate = "StartUp: [OK]";
 			break;
 		}
 		
@@ -461,18 +469,28 @@ void UObject_SK::preSysCommand( const SystemMessage* _sm )
 			// переоткрываем логи
 			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;
 			}
 			
 			if( logserv && !logserv_host.empty() && logserv_port != 0 )
 			{
+				try
+				{
 					mylogany << myname << "(preSysCommand): try restart logserver.." << endl;
 					logserv->check(true);
 				}
+				catch( std::exception& ex )
+				{
+					mywarn << myname << "(preSysCommand): CAN`t restart log server err: " << ex.what() << endl;
+				}
+				catch( ... )
+				{
+					mywarn << myname << "(preSysCommand): CAN`t restart log server err: catch ..." << endl;
+				}
+			}
 		}
 		break;
 
@@ -491,6 +509,7 @@ uniset::SimpleInfo* UObject_SK::getInfo( const char* userparam )
 	ostringstream inf;
 	
 	inf << i->info << endl;
+	inf << "process state: " << ostate << endl;
 	
 	if( logserv /* && userparam < 0 */ )
 	{
@@ -506,16 +525,14 @@ uniset::SimpleInfo* UObject_SK::getInfo( const char* userparam )
 	inf << endl;
 	auto timers = getTimersList();
 	inf << "Timers[" << timers.size() << "]:" << endl;
-
-	for( const auto& t : timers )
+	for( const auto& t: timers )
 	{
 		inf << "  " << setw(15) << getTimerName(t.id) << "[" << t.id  << "]: msec="
 			<< setw(6) << t.tmr.getInterval()
 			<< "    timeleft="  << setw(6) << t.curTimeMS
-			<< "    tick="  << setw(3) << ( t.curTick >= 0 ? t.curTick : -1 )
+			<< "    tick="  << setw(3) << ( t.curTick>=0 ? t.curTick : -1 )
 			<< endl;
 	}
-
 	inf << endl;
 	inf << vmon.pretty_str() << endl;
 	inf << endl;
@@ -533,53 +550,49 @@ Poco::JSON::Object::Ptr UObject_SK::httpGet( const Poco::URI::QueryParameters& p
 	Poco::JSON::Object::Ptr json = UniSetObject::httpGet(params);
 	
 	Poco::JSON::Object::Ptr jdata = json->getObject(myname);
-
 	if( !jdata )
-		jdata = uniset::json::make_child(json, myname);
-
-	Poco::JSON::Object::Ptr jserv = uniset::json::make_child(jdata, "LogServer");
+		jdata = uniset::json::make_child(json,myname);
 
+	Poco::JSON::Object::Ptr jserv = uniset::json::make_child(jdata,"LogServer");
 	if( logserv )
 	{
-		jserv->set("host", logserv_host);
-		jserv->set("port", logserv_port);
-		jserv->set("state", ( logserv->isRunning() ? "RUNNIG" : "STOPPED" ));
+		jserv->set("host",logserv_host);
+		jserv->set("port",logserv_port);
+		jserv->set("state",( logserv->isRunning() ? "RUNNIG" : "STOPPED" ));
 		jserv->set("info", logserv->httpGetShortInfo());
 	}
 		
 	jdata->set("io", httpDumpIO());
 	
 	auto timers = getTimersList();
-	auto jtm = uniset::json::make_child(jdata, "Timers");
-
-	jtm->set("count", timers.size());
+	auto jtm = uniset::json::make_child(jdata,"Timers");
 
-	for( const auto& t : timers )
+	jtm->set("count",timers.size());
+	for( const auto& t: timers )
 	{
-		auto jt = uniset::json::make_child(jtm, to_string(t.id));
+		auto jt = uniset::json::make_child(jtm,to_string(t.id));
 		jt->set("id", t.id);
 		jt->set("name", getTimerName(t.id));
 		jt->set("msec", t.tmr.getInterval());
 		jt->set("timeleft", t.curTimeMS);
-		jt->set("tick", ( t.curTick >= 0 ? t.curTick : -1 ));
+		jt->set("tick", ( t.curTick>=0 ? t.curTick : -1 ));
 	}
 
 	auto vlist = vmon.getList();
-	auto jvmon = uniset::json::make_child(jdata, "Variables");
+	auto jvmon = uniset::json::make_child(jdata,"Variables");
 	
-	for( const auto& v : vlist )
-		jvmon->set(v.first, v.second);
+	for( const auto& v: vlist )
+		jvmon->set(v.first,v.second);
 
 	
-	auto jstat = uniset::json::make_child(jdata, "Statistics");
+	auto jstat = uniset::json::make_child(jdata,"Statistics");
 	jstat->set("processingMessageCatchCount", processingMessageCatchCount);
 
-	auto jsens = uniset::json::make_child(jstat, "sensors");
-
-	for( const auto& s : smStat )
+	auto jsens = uniset::json::make_child(jstat,"sensors");
+	for( const auto& s: smStat )
 	{
 		std::string sname(ORepHelpers::getShortName( uniset_conf()->oind->getMapName(s.first)));
-		auto js = uniset::json::make_child(jsens, sname);
+		auto js = uniset::json::make_child(jsens,sname);
 		js->set("id", s.first);
 		js->set("name", sname);
 		js->set("count", s.second);
@@ -607,13 +620,13 @@ Poco::JSON::Object::Ptr UObject_SK::httpRequest( const std::string& req, const P
 	if( req == "log" )
 		return httpRequestLog(p);
 	
-	return UniSetObject::httpRequest(req, p);
+	return UniSetObject::httpRequest(req,p);
 }
 // -----------------------------------------------------------------------------
 Poco::JSON::Object::Ptr UObject_SK::httpRequestLog( const Poco::URI::QueryParameters& p )
 {
 	Poco::JSON::Object::Ptr jret = new Poco::JSON::Object();
-	jret->set(myname, uniset::json::make_object("log", Debug::str(mylog->level())));
+	jret->set(myname,uniset::json::make_object("log", Debug::str(mylog->level())));
 	return jret;
 }
 // -----------------------------------------------------------------------------
@@ -663,7 +676,7 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
 			<< " testID=" << _testID << endl;
 		
 	// waitReady можно использовать т.к. датчик это по сути IONotifyController
-	if( !ui->waitReady(_testID, wait_msec) )
+	if( !ui->waitReady(_testID,wait_msec) )
 	{
 		ostringstream err;
 		err << myname 
@@ -671,14 +684,11 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
 			<< wait_msec << " мсек";
 
         mycrit << err.str() << endl;
-		//		terminate();
-		//		abort();
-		//		raise(SIGTERM);
-		std::terminate();
-		//		throw uniset::SystemError(err.str());
+		std::abort();
+//		throw uniset::SystemError(err.str());
 	}
 
-	if( !ui->waitWorking(_testID, wait_msec) )
+	if( !ui->waitWorking(_testID,wait_msec) )
 	{
 		ostringstream err;
 		err << myname
@@ -686,11 +696,8 @@ void UObject_SK::waitSM( int wait_msec, ObjectId _testID )
 			<< wait_msec << " мсек";
 	
 		mycrit << err.str() << endl;
-		//		terminate();
-		//		abort();
-		//raise(SIGTERM);
-		std::terminate();
-		//		throw uniset::SystemError(err.str());
+		std::abort();
+//		throw uniset::SystemError(err.str());
 	}
 }
 // ----------------------------------------------------------------------------
@@ -726,42 +733,39 @@ void UObject_SK::callback() noexcept
 {
 	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++ )
 		{
             auto m = receiveMessage();
-
             if( !m )
                 break;
-
             processingMessage(m.get());
 
 			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 uniset::Exception& ex )
@@ -801,7 +805,7 @@ void UObject_SK::setValue( uniset::ObjectId _sid, long _val )
 		
 	
 
-	ui->setValue(_sid, _val);
+	ui->setValue(_sid,_val);
 }
 // -----------------------------------------------------------------------------
 void UObject_SK::updateOutputs( bool _force )
@@ -823,7 +827,7 @@ void UObject_SK::initFromSM()
 // -----------------------------------------------------------------------------
 void UObject_SK::askSensor( uniset::ObjectId _sid, UniversalIO::UIOCommand _cmd, uniset::ObjectId _node )
 {
-	ui->askRemoteSensor(_sid, _cmd, _node, getId());
+	ui->askRemoteSensor(_sid,_cmd,_node,getId());
 }
 // -----------------------------------------------------------------------------
 long UObject_SK::getValue( uniset::ObjectId _sid )
@@ -845,12 +849,10 @@ long UObject_SK::getValue( uniset::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;
 	}
@@ -870,7 +872,7 @@ void UObject_SK::preAskSensors( UniversalIO::UIOCommand _cmd )
 		{
             mycrit << myname << "(preAskSensors): " << ex << endl;
 		}
-		catch( const std::exception& ex )
+	    catch( const std::exception&ex )
     	{
 		mycrit << myname << "(execute): catch " << ex.what()  <<   endl;
 	    }

include/UHttpRequestHandler.h

@@ -75,7 +75,7 @@ namespace uniset
 	namespace UHttp
 	{
 		// текущая версия API
-		const std::string UHTTP_API_VERSION = "v0";
+		const std::string UHTTP_API_VERSION="v01";
 
 		/*! интерфейс для объекта выдающего json-данные */
 		class IHttpRequest

python/lib/pyUniSet/UInterface_wrap.cxx

@@ -4430,6 +4430,58 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ShortIOInfo_supplier_node_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UTypes::ShortIOInfo *arg1 = (UTypes::ShortIOInfo *) 0 ;
+  long arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShortIOInfo_supplier_node_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UTypes__ShortIOInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShortIOInfo_supplier_node_set" "', argument " "1"" of type '" "UTypes::ShortIOInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< UTypes::ShortIOInfo * >(argp1);
+  ecode2 = SWIG_AsVal_long(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShortIOInfo_supplier_node_set" "', argument " "2"" of type '" "long""'");
+  } 
+  arg2 = static_cast< long >(val2);
+  if (arg1) (arg1)->supplier_node = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShortIOInfo_supplier_node_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UTypes::ShortIOInfo *arg1 = (UTypes::ShortIOInfo *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  long result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShortIOInfo_supplier_node_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UTypes__ShortIOInfo, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShortIOInfo_supplier_node_get" "', argument " "1"" of type '" "UTypes::ShortIOInfo *""'"); 
+  }
+  arg1 = reinterpret_cast< UTypes::ShortIOInfo * >(argp1);
+  result = (long) ((arg1)->supplier_node);
+  resultobj = SWIG_From_long(static_cast< long >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_ShortIOInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   UTypes::ShortIOInfo *result = 0 ;
@@ -5403,6 +5455,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ShortIOInfo_tv_nsec_get", _wrap_ShortIOInfo_tv_nsec_get, METH_VARARGS, NULL},
 	 { (char *)"ShortIOInfo_supplier_set", _wrap_ShortIOInfo_supplier_set, METH_VARARGS, NULL},
 	 { (char *)"ShortIOInfo_supplier_get", _wrap_ShortIOInfo_supplier_get, METH_VARARGS, NULL},
+	 { (char *)"ShortIOInfo_supplier_node_set", _wrap_ShortIOInfo_supplier_node_set, METH_VARARGS, NULL},
+	 { (char *)"ShortIOInfo_supplier_node_get", _wrap_ShortIOInfo_supplier_node_get, METH_VARARGS, NULL},
 	 { (char *)"new_ShortIOInfo", _wrap_new_ShortIOInfo, METH_VARARGS, NULL},
 	 { (char *)"delete_ShortIOInfo", _wrap_delete_ShortIOInfo, METH_VARARGS, NULL},
 	 { (char *)"ShortIOInfo_swigregister", ShortIOInfo_swigregister, METH_VARARGS, NULL},

python/lib/pyUniSet/pyUniSet.py

@@ -168,6 +168,8 @@ class ShortIOInfo:
     __swig_getmethods__["tv_nsec"] = _pyUniSet.ShortIOInfo_tv_nsec_get
     __swig_setmethods__["supplier"] = _pyUniSet.ShortIOInfo_supplier_set
     __swig_getmethods__["supplier"] = _pyUniSet.ShortIOInfo_supplier_get
+    __swig_setmethods__["supplier_node"] = _pyUniSet.ShortIOInfo_supplier_node_set
+    __swig_getmethods__["supplier_node"] = _pyUniSet.ShortIOInfo_supplier_node_get
 
     def __init__(self):
         this = _pyUniSet.new_ShortIOInfo()

src/Communications/Http/UHttpRequestHandler.cc

@@ -22,8 +22,11 @@
 // -------------------------------------------------------------------------
 using namespace std;
 using namespace Poco::Net;
-using namespace uniset;
-using namespace UHttp;
+// -------------------------------------------------------------------------
+namespace uniset
+{
+	using namespace UHttp;
+
 // -------------------------------------------------------------------------
 UHttpRequestHandler::UHttpRequestHandler(std::shared_ptr<IHttpRequestRegistry> _registry ):
 	registry(_registry)
@@ -166,4 +169,6 @@ Poco::JSON::Object::Ptr IHttpRequest::httpRequest( const string& req, const Poco
 	throw uniset::SystemError(err.str());
 }
 // -------------------------------------------------------------------------
+} // end of namespace uniset
+// -------------------------------------------------------------------------
 #endif

src/Communications/Http/UHttpServer.cc

@@ -21,8 +21,10 @@
 #include "Exceptions.h"
 // -------------------------------------------------------------------------
 using namespace Poco::Net;
-using namespace uniset;
-using namespace UHttp;
+// -------------------------------------------------------------------------
+namespace uniset
+{
+	using namespace UHttp;
 // -------------------------------------------------------------------------
 
 UHttpServer::UHttpServer(std::shared_ptr<IHttpRequestRegistry>& supplier, const std::string& _host, int _port ):
@@ -76,4 +78,6 @@ std::shared_ptr<DebugStream> UHttpServer::log()
 	return mylog;
 }
 // -------------------------------------------------------------------------
+} // end of namespace uniset
+// -------------------------------------------------------------------------
 #endif // #ifndef DISABLE_REST_API

src/Log/LogServer.cc

@@ -203,7 +203,7 @@ namespace uniset
 			if( mylog.is_crit() )
 				mylog.crit() << err.str() << endl;
 
-			throw SystemError( err.str() );
+			throw uniset::SystemError( err.str() );
 		}
 
 		try
@@ -219,7 +219,18 @@ namespace uniset
 			if( mylog.is_crit() )
 				mylog.crit() << err.str() << endl;
 
-			throw SystemError( err.str() );
+			throw uniset::SystemError( err.str() );
+		}
+		catch( std::exception& ex )
+		{
+			ostringstream err;
+
+			err << myname << "(evprepare): " << ex.what();
+
+			if( mylog.is_crit() )
+				mylog.crit() << err.str() << endl;
+
+			throw uniset::SystemError( err.str() );
 		}
 
 		sock->setBlocking(false);

uniset2.files

@@ -386,6 +386,7 @@ src/Communications/TCP/UTCPStream.cc
 src/Communications/TCP/UTCPSocket.cc
 src/Communications/TCP/USocket.cc
 src/Communications/Http/UHttpRequestHandler.cc
+src/Communications/Http/UHttpServer.cc
 src/Communications/ComPort.cc
 src/Communications/ComPort485F.cc
 src/Communications/Makefile.am