Skip to content
Snippets Groups Projects
Commit 9c750f47 authored by Arno Schoenmakers's avatar Arno Schoenmakers
Browse files

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

parents fee85575 d568853c
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
# NOTE: The loggingprovessor could use the mac.log_prop but it is more safe to # 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. # give him its own file, to avoid race conditions when setting the level too low.
# #
log4cplus.rootLogger=DEBUG, FILE, MACCLP log4cplus.rootLogger=INFO, DAILYFILE, MACCLP
log4cplus.logger.TRC=DEBUG, FILE log4cplus.logger.TRC=DEBUG, DUMP
# The next line should always be active.
log4cplus.additivity.TRC=FALSE log4cplus.additivity.TRC=FALSE
# #
...@@ -15,6 +17,13 @@ log4cplus.appender.STDOUT=log4cplus::ConsoleAppender ...@@ -15,6 +17,13 @@ log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout 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} %-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=log4cplus::RollingFileAppender
log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.MaxFileSize=10MB log4cplus.appender.FILE.MaxFileSize=10MB
...@@ -25,7 +34,7 @@ log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p % ...@@ -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=log4cplus::SocketAppender
log4cplus.appender.MACCLP.port=23999 log4cplus.appender.MACCLP.port=23999
log4cplus.appender.MACCLP.host=localhost log4cplus.appender.MACCLP.host=localhost
log4cplus.appender.MACCLP.Threshold=INFO log4cplus.appender.MACCLP.Threshold=WARN
log4cplus.appender.DUMP=log4cplus::NullAppender log4cplus.appender.DUMP=log4cplus::NullAppender
...@@ -73,8 +73,8 @@ PVSSGateway - C Y LOFAR_PermSW_Daemons_PVSSGateway ...@@ -73,8 +73,8 @@ PVSSGateway - C Y LOFAR_PermSW_Daemons_PVSSGateway
CTStartDaemon - C Y LOFAR_PermSW_CTStartDaemon CTStartDaemon - C Y LOFAR_PermSW_CTStartDaemon
CEPObsSW - C N LOFAR_ObsSW CEPObsSW - C N LOFAR_ObsSW
CEPObservation - C N LOFAR_ObsSW_@observation@ CEPObservation - C N LOFAR_ObsSW_@observation@
OnlineControl OLC C N LOFAR_ObsSW_@observation@_OnlineControl OnlineControl OLC C Y LOFAR_ObsSW_@observation@_OnlineControl
PythonControl - C N LOFAR_ObsSW_@observation@_PythonControl PythonControl - C Y LOFAR_ObsSW_@observation@_PythonControl
BGPAppl BGPA C N LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl BGPAppl BGPA C N LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl
BGPProc - C Y LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl_BGPProc BGPProc - C Y LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl_BGPProc
CobaltRack - C N LOFAR_PIC_Cobalt CobaltRack - C N LOFAR_PIC_Cobalt
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# - Select the appropriate log-level for the rootLogger (DEBUG or INFO) # - Select the appropriate log-level for the rootLogger (DEBUG or INFO)
# - Leave the TRC logger on DEBUG,DUMP # - Leave the TRC logger on DEBUG,DUMP
# - Comment out the rootLogger and the TRC logger in the TEST section of this file # - 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.rootLogger=INFO, DAILYFILE, MACCLP
log4cplus.logger.TRC=DEBUG, DUMP log4cplus.logger.TRC=DEBUG, DUMP
...@@ -49,7 +49,7 @@ log4cplus.appender.ROLFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} ...@@ -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=log4cplus::SocketAppender
log4cplus.appender.MACCLP.port=23999 log4cplus.appender.MACCLP.port=23999
log4cplus.appender.MACCLP.host=localhost log4cplus.appender.MACCLP.host=localhost
log4cplus.appender.MACCLP.Threshold=INFO log4cplus.appender.MACCLP.Threshold=WARN
log4cplus.appender.DUMP=log4cplus::NullAppender log4cplus.appender.DUMP=log4cplus::NullAppender
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# - Select the appropriate log-level for the rootLogger (DEBUG or INFO) # - Select the appropriate log-level for the rootLogger (DEBUG or INFO)
# - Leave the TRC logger on DEBUG,DUMP # - Leave the TRC logger on DEBUG,DUMP
# - Comment out the rootLogger and the TRC logger in the TEST section of this file # - 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.rootLogger=INFO, DAILYFILE, MACCLP
log4cplus.logger.TRC=DEBUG, DUMP log4cplus.logger.TRC=DEBUG, DUMP
...@@ -49,7 +49,7 @@ log4cplus.appender.ROLFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} ...@@ -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=log4cplus::SocketAppender
log4cplus.appender.MACCLP.port=23999 log4cplus.appender.MACCLP.port=23999
log4cplus.appender.MACCLP.host=localhost log4cplus.appender.MACCLP.host=localhost
log4cplus.appender.MACCLP.Threshold=INFO log4cplus.appender.MACCLP.Threshold=WARN
log4cplus.appender.DUMP=log4cplus::NullAppender log4cplus.appender.DUMP=log4cplus::NullAppender
...@@ -34,21 +34,21 @@ log4cplus.additivity.TRC=FALSE ...@@ -34,21 +34,21 @@ log4cplus.additivity.TRC=FALSE
# Definitions of the output channels # Definitions of the output channels
log4cplus.appender.STDOUT=log4cplus::ConsoleAppender log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout 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=log4cplus::DailyRollingFileAppender
log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.DAILYFILE.Schedule=DAILY log4cplus.appender.DAILYFILE.Schedule=DAILY
log4cplus.appender.DAILYFILE.MaxBackupIndex=14 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout 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=log4cplus::RollingFileAppender
log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.MaxFileSize=10MB log4cplus.appender.ROLFILE.MaxFileSize=10MB
log4cplus.appender.ROLFILE.MaxBackupIndex=9 log4cplus.appender.ROLFILE.MaxBackupIndex=9
log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout 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 log4cplus.appender.DUMP=log4cplus::NullAppender
...@@ -8,7 +8,8 @@ if [ "$USER" == "lofarsys" ] ...@@ -8,7 +8,8 @@ if [ "$USER" == "lofarsys" ]
then then
if [ "`basename $HOME`" == "lofartest" ] if [ "`basename $HOME`" == "lofartest" ]
then then
PARTITION=R01-M0-N00-32 # test partition PARTITION=R00 # production partition
# PARTITION=R01-M0-N00-32 # test partition NOW OBSOLETED!
else else
PARTITION=R00 # production partition PARTITION=R00 # production partition
fi fi
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</parent> </parent>
<artifactId>OTB-distribution</artifactId> <artifactId>OTB-distribution</artifactId>
<version>1.17.4</version> <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>RSP</artifactId> <artifactId>RSP</artifactId>
<version>1.17.4</version> <version>2.1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>OTB-distribution</artifactId> <artifactId>OTB-distribution</artifactId>
<version>1.17.4</version> <version>2.1.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- Import the group 'nl.astron.lofar.lib' --> <!-- Import the group 'nl.astron.lofar.lib' -->
......
...@@ -111,7 +111,7 @@ CREATE TYPE OTDBvalue AS ( ...@@ -111,7 +111,7 @@ CREATE TYPE OTDBvalue AS (
paramID INT4, paramID INT4,
name VARCHAR(150), name VARCHAR(150),
value TEXT, value TEXT,
time timestamp(0) time timestamp
); );
......
...@@ -38,7 +38,7 @@ CREATE OR REPLACE VIEW pktemp AS SELECT DISTINCT ON (paramid) paramid, value, ti ...@@ -38,7 +38,7 @@ CREATE OR REPLACE VIEW pktemp AS SELECT DISTINCT ON (paramid) paramid, value, ti
CREATE OR REPLACE FUNCTION nextPICkvt(int,timestamp) CREATE OR REPLACE FUNCTION nextPICkvt(int,timestamp)
RETURNS SETOF OTDBvalue AS $$ RETURNS SETOF OTDBvalue AS $$
SELECT paramid,''::VARCHAR(150),value,time::timestamp(0) SELECT paramid,''::VARCHAR(150),value,time::timestamp
FROM pickvt FROM pickvt
WHERE paramid=$1 AND time>$2 WHERE paramid=$1 AND time>$2
ORDER BY TIME ORDER BY TIME
...@@ -70,12 +70,12 @@ CREATE OR REPLACE FUNCTION getBrokenHardware(VARCHAR(20), VARCHAR(20)) ...@@ -70,12 +70,12 @@ CREATE OR REPLACE FUNCTION getBrokenHardware(VARCHAR(20), VARCHAR(20))
END IF; END IF;
FOR vRecord IN FOR vRecord IN
EXECUTE ' 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 FROM pktemp p
LEFT JOIN PICparamref r ON r.paramid = p.paramid ' || vWhere LEFT JOIN PICparamref r ON r.paramid = p.paramid ' || vWhere
LOOP LOOP
FOR vRecord2 IN 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 FROM nextPICkvt(vRecord.paramid,vRecord.time) p
LEFT JOIN PICparamref r ON r.paramid = p.paramid LEFT JOIN PICparamref r ON r.paramid = p.paramid
LOOP LOOP
......
...@@ -117,15 +117,33 @@ int main (int argc, char* argv[]) { ...@@ -117,15 +117,33 @@ int main (int argc, char* argv[]) {
INIT_LOGGER(basename(argv[0])); INIT_LOGGER(basename(argv[0]));
LOG_INFO_STR("Starting " << argv[0]); LOG_INFO_STR("Starting " << argv[0]);
if (argc != 1) { if (argc > 3) {
cout << "Usage: tBrokenHardware " << endl; cout << "Usage: tBrokenHardware [starttime [endtime]]" << endl;
return (1); return (1);
} }
// try to resolve the database name // try to resolve the database name
string dbName("TESTLOFAR_4"); string dbName("TESTLOFAR_4");
string hostName("rs005.astron.nl"); string hostName("rs005.astron.nl");
char line[64];
int32 sleeptime = 1; 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 << " ###"); LOG_INFO_STR("### Using database " << dbName << " on host " << hostName << " ###");
sleep (sleeptime); sleep (sleeptime);
...@@ -140,7 +158,6 @@ int main (int argc, char* argv[]) { ...@@ -140,7 +158,6 @@ int main (int argc, char* argv[]) {
ClassifConv CTconv(&conn); ClassifConv CTconv(&conn);
try { try {
LOG_INFO("Trying to connect to the database"); LOG_INFO("Trying to connect to the database");
ASSERTSTR(conn.connect(), "Connnection failed"); ASSERTSTR(conn.connect(), "Connnection failed");
LOG_INFO_STR("Connection succesful: " << conn); LOG_INFO_STR("Connection succesful: " << conn);
...@@ -159,6 +176,20 @@ int main (int argc, char* argv[]) { ...@@ -159,6 +176,20 @@ int main (int argc, char* argv[]) {
LOG_INFO("Trying to construct a TreeValue object"); LOG_INFO("Trying to construct a TreeValue object");
TreeValue tv(&conn, treeID); 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()"); LOG_INFO ("getBrokenHardware()");
vector<OTDBvalue> valueList=tv.getBrokenHardware(); vector<OTDBvalue> valueList=tv.getBrokenHardware();
...@@ -190,6 +221,7 @@ int main (int argc, char* argv[]) { ...@@ -190,6 +221,7 @@ int main (int argc, char* argv[]) {
time_from_string("2012-10-15 12:00:00")); time_from_string("2012-10-15 12:00:00"));
showValueList(valueList); showValueList(valueList);
} }
} // default tests
} }
catch (std::exception& ex) { catch (std::exception& ex) {
LOG_FATAL_STR("Unexpected exception: " << ex.what()); LOG_FATAL_STR("Unexpected exception: " << ex.what());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment