Task #5484: Reintegrated preRelease branch into trunk prior to creating new Release branch

MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop

@@ -4,8 +4,10 @@
 # NOTE: The loggingprovessor could use the mac.log_prop but it is more safe to
 #		give him its own file, to avoid race conditions when setting the level too low.
 #
-log4cplus.rootLogger=DEBUG, FILE, MACCLP
-log4cplus.logger.TRC=DEBUG, FILE
+log4cplus.rootLogger=INFO, DAILYFILE, MACCLP
+log4cplus.logger.TRC=DEBUG, DUMP
+
+# The next line should always be active.
 log4cplus.additivity.TRC=FALSE
 
 #
@@ -15,6 +17,13 @@ log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
 log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
 log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
 
+log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
+log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.DAILYFILE.Schedule=DAILY
+log4cplus.appender.DAILYFILE.MaxBackupIndex=14
+log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
+log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
+
 log4cplus.appender.FILE=log4cplus::RollingFileAppender
 log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.FILE.MaxFileSize=10MB
@@ -25,7 +34,7 @@ log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %
 log4cplus.appender.MACCLP=log4cplus::SocketAppender
 log4cplus.appender.MACCLP.port=23999
 log4cplus.appender.MACCLP.host=localhost
-log4cplus.appender.MACCLP.Threshold=INFO
+log4cplus.appender.MACCLP.Threshold=WARN
 
 log4cplus.appender.DUMP=log4cplus::NullAppender
 

MAC/Deployment/data/PVSS/data/PVSSDataPoints.base

@@ -73,8 +73,8 @@ PVSSGateway			-		C	Y	LOFAR_PermSW_Daemons_PVSSGateway
 CTStartDaemon			-		C	Y	LOFAR_PermSW_CTStartDaemon
 CEPObsSW			-		C	N	LOFAR_ObsSW
 CEPObservation			-		C	N	LOFAR_ObsSW_@observation@
-OnlineControl			OLC		C	N	LOFAR_ObsSW_@observation@_OnlineControl
-PythonControl			-		C	N	LOFAR_ObsSW_@observation@_PythonControl
+OnlineControl			OLC		C	Y	LOFAR_ObsSW_@observation@_OnlineControl
+PythonControl			-		C	Y	LOFAR_ObsSW_@observation@_PythonControl
 BGPAppl				BGPA		C	N	LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl
 BGPProc				-		C	Y	LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl_BGPProc
 CobaltRack			-		C	N	LOFAR_PIC_Cobalt

MAC/GCF/TM/src/mac.log_prop

@@ -12,7 +12,7 @@
 # - Select the appropriate log-level for the rootLogger (DEBUG or INFO)
 # - Leave the TRC logger on DEBUG,DUMP
 # - Comment out the rootLogger and the TRC logger in the TEST section of this file
-#log4cplus.rootLogger=DEBUG, DAILYFILE, MACCLP
+#log4cplus.rootLogger=DEBUG, DAILYFILE
 log4cplus.rootLogger=INFO, DAILYFILE, MACCLP
 log4cplus.logger.TRC=DEBUG, DUMP
 
@@ -49,7 +49,7 @@ log4cplus.appender.ROLFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q}
 log4cplus.appender.MACCLP=log4cplus::SocketAppender
 log4cplus.appender.MACCLP.port=23999
 log4cplus.appender.MACCLP.host=localhost
-log4cplus.appender.MACCLP.Threshold=INFO
+log4cplus.appender.MACCLP.Threshold=WARN
 
 log4cplus.appender.DUMP=log4cplus::NullAppender
 

MAC/GCF/TM/src/mac_debug.log_prop

@@ -12,7 +12,7 @@
 # - Select the appropriate log-level for the rootLogger (DEBUG or INFO)
 # - Leave the TRC logger on DEBUG,DUMP
 # - Comment out the rootLogger and the TRC logger in the TEST section of this file
-log4cplus.rootLogger=DEBUG, DAILYFILE, MACCLP
+log4cplus.rootLogger=DEBUG, DAILYFILE
 #log4cplus.rootLogger=INFO, DAILYFILE, MACCLP
 log4cplus.logger.TRC=DEBUG, DUMP
 
@@ -49,7 +49,7 @@ log4cplus.appender.ROLFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q}
 log4cplus.appender.MACCLP=log4cplus::SocketAppender
 log4cplus.appender.MACCLP.port=23999
 log4cplus.appender.MACCLP.host=localhost
-log4cplus.appender.MACCLP.Threshold=INFO
+log4cplus.appender.MACCLP.Threshold=WARN
 
 log4cplus.appender.DUMP=log4cplus::NullAppender
 

MAC/GCF/TM/src/mac_nopvss.log_prop

@@ -34,21 +34,21 @@ log4cplus.additivity.TRC=FALSE
 # Definitions of the output channels
 log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
 log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
+log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
 log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.DAILYFILE.Schedule=DAILY
 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
 log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
-log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
+log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.ROLFILE=log4cplus::RollingFileAppender
 log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.ROLFILE.MaxFileSize=10MB
 log4cplus.appender.ROLFILE.MaxBackupIndex=9
 log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
-log4cplus.appender.ROLFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
+log4cplus.appender.ROLFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DUMP=log4cplus::NullAppender
 

RTCP/Run/src/BlueGeneControl.conf

@@ -8,7 +8,8 @@ if [ "$USER" == "lofarsys" ]
 then
   if [ "`basename $HOME`" == "lofartest" ]
   then
-    PARTITION=R01-M0-N00-32 # test partition
+    PARTITION=R00           # production partition
+    # PARTITION=R01-M0-N00-32 # test partition NOW OBSOLETED!
   else
     PARTITION=R00           # production partition
   fi

SAS/OTB/OTB-distribution/pom.xml

@@ -14,7 +14,7 @@
   </parent>
 
   <artifactId>OTB-distribution</artifactId>
-  <version>1.17.4</version>
+  <version>2.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
 

SAS/OTB/pom.xml

@@ -121,7 +121,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>RSP</artifactId>
-        <version>1.17.4</version>
+        <version>2.1.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -145,7 +145,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>OTB-distribution</artifactId>
-        <version>1.17.4</version>
+        <version>2.1.0-SNAPSHOT</version>
       </dependency>
 
       <!-- Import the group 'nl.astron.lofar.lib' -->

SAS/OTDB/sql/create_types.sql

@@ -111,7 +111,7 @@ CREATE TYPE OTDBvalue AS (
 	paramID			INT4,
 	name			VARCHAR(150),
 	value			TEXT,
-	time			timestamp(0)
+	time			timestamp
 );
 
 

SAS/OTDB/sql/getBrokenHardware_func.sql

@@ -38,7 +38,7 @@ CREATE OR REPLACE VIEW pktemp AS SELECT DISTINCT ON (paramid) paramid, value, ti
 
 CREATE OR REPLACE FUNCTION nextPICkvt(int,timestamp) 
 	RETURNS SETOF OTDBvalue AS $$ 
-	SELECT   paramid,''::VARCHAR(150),value,time::timestamp(0)
+	SELECT   paramid,''::VARCHAR(150),value,time::timestamp
 	FROM     pickvt 
 	WHERE    paramid=$1 AND time>$2 
 	ORDER BY TIME 
@@ -70,12 +70,12 @@ CREATE OR REPLACE FUNCTION getBrokenHardware(VARCHAR(20), VARCHAR(20))
 		END IF;
 		FOR vRecord IN 
 			EXECUTE '
-				SELECT p.paramid,r.pvssname::VARCHAR(150),p.value,p.time::timestamp(0)
+				SELECT p.paramid,r.pvssname::VARCHAR(150),p.value,p.time::timestamp
 				FROM pktemp p
 				LEFT JOIN PICparamref r ON r.paramid = p.paramid ' || vWhere
 		LOOP
 			FOR vRecord2 IN 
-				SELECT p.paramid,r.pvssname::VARCHAR(150),p.value,p.time::timestamp(0)
+				SELECT p.paramid,r.pvssname::VARCHAR(150),p.value,p.time::timestamp
 				FROM nextPICkvt(vRecord.paramid,vRecord.time) p
 				LEFT JOIN PICparamref r ON r.paramid = p.paramid
 			LOOP

SAS/OTDB/test/tBrokenHardware.cc

@@ -117,15 +117,33 @@ int main (int	argc, char*	argv[]) {
 	INIT_LOGGER(basename(argv[0]));
 	LOG_INFO_STR("Starting " << argv[0]);
 
-	if (argc != 1) {
-		cout << "Usage: tBrokenHardware " << endl;
+	if (argc > 3) {
+		cout << "Usage: tBrokenHardware [starttime [endtime]]" << endl;
 		return (1);
 	}
 
 	// try to resolve the database name
 	string 		dbName("TESTLOFAR_4");
 	string		hostName("rs005.astron.nl");
+	char		line[64];
 	int32		sleeptime = 1;
+	ifstream	inFile;
+	inFile.open("DATABASENAME");
+	if (!inFile || !inFile.getline(line, 40)) {
+		sleeptime	= 4;
+	}
+	else {
+		char*	pos = strchr(line, ' ');
+		if (pos) {
+			hostName = pos+1;
+			*pos = '\0';		// place new EOL in 'line'
+			dbName = line;	
+		}
+		else {
+			dbName = line;
+		}
+	}
+	inFile.close();
 	LOG_INFO_STR("### Using database " << dbName << " on host " << hostName << " ###");
 	sleep (sleeptime);
 
@@ -140,7 +158,6 @@ int main (int	argc, char*	argv[]) {
 	ClassifConv		CTconv(&conn);
 
 	try {
-
 		LOG_INFO("Trying to connect to the database");
 		ASSERTSTR(conn.connect(), "Connnection failed");
 		LOG_INFO_STR("Connection succesful: " << conn);
@@ -159,6 +176,20 @@ int main (int	argc, char*	argv[]) {
 		LOG_INFO("Trying to construct a TreeValue object");
 		TreeValue	tv(&conn, treeID);
 
+		if (argc > 1) {
+			if (argc == 2) {	// startTime only?
+				LOG_INFO_STR ("getBrokenHardware(" << argv[1] << ")");
+				vector<OTDBvalue>	valueList=tv.getBrokenHardware(time_from_string(argv[1]));
+				showValueList(valueList);
+			}
+			else {	// both times specified
+				LOG_INFO_STR ("getBrokenHardware(" << argv[1] << ", " << argv[2] << ")");
+				vector<OTDBvalue>	valueList=tv.getBrokenHardware(time_from_string(argv[1]),
+																   time_from_string(argv[2]));
+				showValueList(valueList);
+			}
+		}
+		else { // do default tests
 			{
 			LOG_INFO ("getBrokenHardware()");
 			vector<OTDBvalue>	valueList=tv.getBrokenHardware();
@@ -190,6 +221,7 @@ int main (int	argc, char*	argv[]) {
 															   time_from_string("2012-10-15 12:00:00"));
 			showValueList(valueList);
 			}
+		} // default tests
 	}
 	catch (std::exception&	ex) {
 		LOG_FATAL_STR("Unexpected exception: " << ex.what());