(LogicProcessor): исправил баг с определением iotype датчика

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.0
-Release: alt59
+Release: alt60
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -213,6 +213,9 @@ rm -f %buildroot%_libdir/*.la
 
 
 %changelog
+* Wed Dec 21 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt60
+- fixed bug in LogicProcessor
+
 * Mon Dec 19 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt59
 - add precision for output variables
 

extensions/LogicProcessor/PassiveLProcessor.cc

@@ -90,7 +90,7 @@ void PassiveLProcessor::sysCommand( UniSetTypes::SystemMessage *sm )
 		{
 			if( !shm->waitSMready(10000) )
 			{
-				cerr << "(ERR): SM not ready. Terminated... " << endl;
+				dlog[Debug::CRIT] << "(ERR): SM not ready. Terminated... " << endl;
 				raise(SIGTERM);
 				return;
 			}
@@ -163,17 +163,17 @@ void PassiveLProcessor::setOuts()
 				break;
 
 				default:
-					cerr << "(LProcessor::setOuts): неподдерживаемый тип iotype=" << it->iotype << endl;
+					dlog[Debug::CRIT] << "(LProcessor::setOuts): неподдерживаемый тип iotype=" << it->iotype << endl;
 					break;
 			}
 		}
 		catch( Exception& ex )
 		{
-			cerr << "(LProcessor::setOuts): " << ex << endl;
+			dlog[Debug::CRIT] << "(LProcessor::setOuts): " << ex << endl;
 		}
 		catch(...)
 		{
-			cerr << "(LProcessor::setOuts): catch...\n";
+			dlog[Debug::CRIT] << "(LProcessor::setOuts): catch...\n";
 		}
 	}
 }
@@ -195,17 +195,17 @@ void PassiveLProcessor::sigterm( int signo )
 				break;
 
 				default:
-					cerr << "(LProcessor::sigterm): неподдерживаемый тип iotype=" << it->iotype << endl;
+					dlog[Debug::CRIT] << "(LProcessor::sigterm): неподдерживаемый тип iotype=" << it->iotype << endl;
 					break;
 			}
 		}
 		catch( Exception& ex )
 		{
-			cerr << "(LProcessor::sigterm): " << ex << endl;
+			dlog[Debug::CRIT] << "(LProcessor::sigterm): " << ex << endl;
 		}
 		catch(...)
 		{
-			cerr << "(LProcessor::sigterm): catch...\n";
+			dlog[Debug::CRIT] << "(LProcessor::sigterm): catch...\n";
 		}
 	}
 }
@@ -243,7 +243,7 @@ void PassiveLProcessor::processingMessage( UniSetTypes::VoidMessage* msg )
 	}
 	catch(Exception& ex)
 	{
-		cout  << myname << "(processingMessage): " << ex << endl;
+		dlog[Debug::CRIT]  << myname << "(processingMessage): " << ex << endl;
 	}
 }
 // -----------------------------------------------------------------------------

extensions/LogicProcessor/start_fg_plogic.sh

 #!/bin/sh
 
-uniset-start.sh -f ./uniset-plogicproc --schema schema.xml \
+uniset-start.sh -g ./uniset-plogicproc --schema schema.xml \
 --smemory-id SharedMemory --name LProcessor \
 --confile test.xml --unideb-add-levels info,crit,warn,level9,system