diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop
index 81123236264e6840762ad50150928395af23ad8b..d629617d52738f4beb6db437a2975f9ebea2865e 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop
+++ b/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
diff --git a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
index ec7de527e9a819739eaee975752fb1fce7b9d007..5f78404d2dfb5966ec453e4905e69c026fb2fdc3 100644
--- a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
+++ b/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
diff --git a/MAC/GCF/TM/src/mac.log_prop b/MAC/GCF/TM/src/mac.log_prop
index 7bace54585c7135609f7c71590a16bdb5582aaed..ae4171def5f96d8d54673fff3617944859de8510 100644
--- a/MAC/GCF/TM/src/mac.log_prop
+++ b/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
diff --git a/MAC/GCF/TM/src/mac_debug.log_prop b/MAC/GCF/TM/src/mac_debug.log_prop
index ad9f04628724c8479d646c28c3ce6fa330e86d6f..e63ba0eba91602bf2b958ec7e3ec6c94722417da 100644
--- a/MAC/GCF/TM/src/mac_debug.log_prop
+++ b/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
diff --git a/MAC/GCF/TM/src/mac_nopvss.log_prop b/MAC/GCF/TM/src/mac_nopvss.log_prop
index 00e094d6aa18c4897f07bbd845329f7583e80dd2..7d9b58233e7cdcf5fec6a7582a6fa29c77a3681e 100644
--- a/MAC/GCF/TM/src/mac_nopvss.log_prop
+++ b/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
diff --git a/RTCP/Run/src/BlueGeneControl.conf b/RTCP/Run/src/BlueGeneControl.conf
index 25bd445b64def437aabbdb9f18268a893950c231..cafdf81fc35dae046a53459afb65feb620a69b0f 100644
--- a/RTCP/Run/src/BlueGeneControl.conf
+++ b/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
diff --git a/SAS/OTB/OTB-distribution/pom.xml b/SAS/OTB/OTB-distribution/pom.xml
index 465adf1af0ca87729eda44ce8df70cb80304e04c..e81afaa403a2b0f5bd1f1dde6af5c88e0130209b 100644
--- a/SAS/OTB/OTB-distribution/pom.xml
+++ b/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>
diff --git a/SAS/OTB/pom.xml b/SAS/OTB/pom.xml
index 7489ea63c30c2c36eafd19a999bfd5ab0851d5a3..f7fff73af97a63c81228fc567875ebda08bec317 100644
--- a/SAS/OTB/pom.xml
+++ b/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' -->
diff --git a/SAS/OTDB/sql/create_types.sql b/SAS/OTDB/sql/create_types.sql
index 8ffce7c114cbe67256f86af2d310329a7f9e87ca..92730d73c18bf114f14083d19655078f47ea491b 100644
--- a/SAS/OTDB/sql/create_types.sql
+++ b/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
);
diff --git a/SAS/OTDB/sql/getBrokenHardware_func.sql b/SAS/OTDB/sql/getBrokenHardware_func.sql
index 342d58a173891e17fab797fe68ef8dfc0b227158..7112549dbea6b2314d617dbad8b4b49c6e129a6b 100644
--- a/SAS/OTDB/sql/getBrokenHardware_func.sql
+++ b/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
diff --git a/SAS/OTDB/test/tBrokenHardware.cc b/SAS/OTDB/test/tBrokenHardware.cc
index 88c27d70f501264970c1052b119231764035823b..c1d50159dcbd27d41a8a2f1a1b8a4a2f0a7e9fcb 100644
--- a/SAS/OTDB/test/tBrokenHardware.cc
+++ b/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,37 +176,52 @@ int main (int argc, char* argv[]) {
LOG_INFO("Trying to construct a TreeValue object");
TreeValue tv(&conn, treeID);
- {
- LOG_INFO ("getBrokenHardware()");
- vector<OTDBvalue> valueList=tv.getBrokenHardware();
- showValueList(valueList);
- }
-
- {
- LOG_INFO ("getBrokenHardware('2012-10-15 09:00:00')");
- vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-15 09:00:00"));
- showValueList(valueList);
- }
-
- {
- LOG_INFO ("getBrokenHardware('2012-10-15 12:00:00')");
- vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-15 12:00:00"));
- showValueList(valueList);
- }
-
- {
- LOG_INFO ("getBrokenHardware('2012-10-15 12:00:00', '2012-10-16 12:00:00')");
- vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-15 12:00:00"),
- time_from_string("2012-10-16 12:00:00"));
- showValueList(valueList);
- }
-
- {
- LOG_INFO ("getBrokenHardware('2012-10-14 12:00:00', '2012-10-15 12:00:00')");
- vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-14 12:00:00"),
- time_from_string("2012-10-15 12:00:00"));
- showValueList(valueList);
+ 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();
+ showValueList(valueList);
+ }
+
+ {
+ LOG_INFO ("getBrokenHardware('2012-10-15 09:00:00')");
+ vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-15 09:00:00"));
+ showValueList(valueList);
+ }
+
+ {
+ LOG_INFO ("getBrokenHardware('2012-10-15 12:00:00')");
+ vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-15 12:00:00"));
+ showValueList(valueList);
+ }
+
+ {
+ LOG_INFO ("getBrokenHardware('2012-10-15 12:00:00', '2012-10-16 12:00:00')");
+ vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-15 12:00:00"),
+ time_from_string("2012-10-16 12:00:00"));
+ showValueList(valueList);
+ }
+
+ {
+ LOG_INFO ("getBrokenHardware('2012-10-14 12:00:00', '2012-10-15 12:00:00')");
+ vector<OTDBvalue> valueList=tv.getBrokenHardware(time_from_string("2012-10-14 12:00:00"),
+ time_from_string("2012-10-15 12:00:00"));
+ showValueList(valueList);
+ }
+ } // default tests
}
catch (std::exception& ex) {
LOG_FATAL_STR("Unexpected exception: " << ex.what());