Skip to content
Snippets Groups Projects
Commit 3eabeeea authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #6314: Use LOFARROOT instead of /opt/lofar as often as possible, and... 

Task #6314: Use LOFARROOT instead of /opt/lofar as often as possible, and enable LogClient for Cobalt
parents 9de9ce2b 9cd0dc90
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 23 additions and 22 deletions
MAC/APL/APLCommon/src/swlevel
+ 2
− 2
View file @ 3eabeeea
......@@ -584,8 +584,8 @@ print_level()
show_lofar_version()
{
if [ -e /opt/lofar/Version.txt ]; then
version=`cat /opt/lofar/Version.txt`
if [ -e $LOFARROOT/Version.txt ]; then
version=`cat $LOFARROOT/Version.txt`
if [ "$1" = "v" ]; then
echo -n "Current LOFAR version is "
fi
......
MAC/APL/APLCommon/src/swlevel.conf
+ 1
− 1
View file @ 3eabeeea
......@@ -8,7 +8,7 @@
1:u:d:::PVSS00pmon
1:u:d:::SoftwareMonitor
1:u:d:::LogProcessor
#1:u:d:::LogClient
1:u:d:::LogClient
1:u:d:::ServiceBroker
1:u:d:::SASGateway
1:u:d:::PVSSGateway
......
MAC/APL/Appl_Controller/src/ACDaemon.log_prop
+ 1
− 1
View file @ 3eabeeea
......@@ -15,7 +15,7 @@ log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c
log4cplus.appender.STDERR.logToStdErr=true
log4cplus.appender.FILE=log4cplus::RollingFileAppender
log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.MaxFileSize=10MB
log4cplus.appender.FILE.MaxBackupIndex=2
log4cplus.appender.FILE.layout=log4cplus::PatternLayout
......
MAC/APL/Appl_Controller/src/ACuserMenu.log_prop
+ 1
− 1
View file @ 3eabeeea
......@@ -15,7 +15,7 @@ log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c
log4cplus.appender.STDERR.logToStdErr=true
log4cplus.appender.FILE=log4cplus::RollingFileAppender
log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.MaxFileSize=10MB
log4cplus.appender.FILE.MaxBackupIndex=2
log4cplus.appender.FILE.layout=log4cplus::PatternLayout
......
MAC/APL/Appl_Controller/src/ApplController.log_prop
+ 1
− 1
View file @ 3eabeeea
......@@ -15,7 +15,7 @@ log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c
log4cplus.appender.STDERR.logToStdErr=true
log4cplus.appender.FILE=log4cplus::RollingFileAppender
log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.MaxFileSize=10MB
log4cplus.appender.FILE.MaxBackupIndex=2
log4cplus.appender.FILE.layout=log4cplus::PatternLayout
......
MAC/APL/Appl_Controller/src/startAP.sh
+ 1
− 1
View file @ 3eabeeea
......@@ -21,4 +21,4 @@ $3 ACC $4 $2 &
pid=`echo $!`
# construct pid file for stop shell
echo "$pid" > /opt/lofar/var/run/$2.pid
echo "$pid" > $LOFARROOT/var/run/$2.pid
MAC/APL/Appl_Controller/src/stopAP.sh
+ 3
− 3
View file @ 3eabeeea
......@@ -9,6 +9,6 @@
# DISABLED this script: startBGL.sh starts all CEP processes
exit
echo -n "Killing process "; cat /opt/lofar/var/run/$2.pid
kill -9 `cat /opt/lofar/var/run/$2.pid`
rm -f /opt/lofar/var/run/$2.pid /opt/lofar/var/run/$2.parset
echo -n "Killing process "; cat $LOFARROOT/var/run/$2.pid
kill -9 `cat $LOFARROOT/var/run/$2.pid`
rm -f $LOFARROOT/var/run/$2.pid $LOFARROOT/var/run/$2.parset
MAC/APL/CUDaemons/CT_StartDaemon/startController.sh
+ 2
− 1
View file @ 3eabeeea
#!/bin/bash
# startController.sh executable taskname parenthostname parentService
#
# start the given executable
#
# start process
($1 $2 $3 $4 1 2>&1 | awk '{ print strftime("%Y-%m-%d %H:%M:%S"),$0; }' >>"/opt/lofar/var/log/$2.stdout") &
($1 $2 $3 $4 1 2>&1 | awk '{ print strftime("%Y-%m-%d %H:%M:%S"),$0; }' >>"${LOFARROOT:-/opt/lofar}/var/log/$2.stdout") &
# get its pid
# echo $!
......
MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop
+ 2
− 2
View file @ 3eabeeea
......@@ -18,14 +18,14 @@ 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.File=${LOFARROOT}/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.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.FILE.MaxFileSize=10MB
log4cplus.appender.FILE.MaxBackupIndex=9
log4cplus.appender.FILE.layout=log4cplus::PatternLayout
......
MAC/APL/Log_Client/src/LogClient.log_prop
+ 2
− 2
View file @ 3eabeeea
......@@ -33,14 +33,14 @@ 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.File=${LOFARROOT}/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.ROLFILE=log4cplus::RollingFileAppender
log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.MaxFileSize=10MB
log4cplus.appender.ROLFILE.MaxBackupIndex=9
log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
......
MAC/GCF/TM/src/mac.log_prop
+ 2
− 2
View file @ 3eabeeea
......@@ -33,14 +33,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
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.File=${LOFARROOT}/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.ROLFILE=log4cplus::RollingFileAppender
log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.MaxFileSize=10MB
log4cplus.appender.ROLFILE.MaxBackupIndex=9
log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
......
MAC/GCF/TM/src/mac_debug.log_prop
+ 2
− 2
View file @ 3eabeeea
......@@ -33,14 +33,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
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.File=${LOFARROOT}/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.ROLFILE=log4cplus::RollingFileAppender
log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.MaxFileSize=10MB
log4cplus.appender.ROLFILE.MaxBackupIndex=9
log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
......
MAC/GCF/TM/src/mac_nopvss.log_prop
+ 2
− 2
View file @ 3eabeeea
......@@ -37,14 +37,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
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.File=${LOFARROOT}/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.ROLFILE=log4cplus::RollingFileAppender
log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
log4cplus.appender.ROLFILE.MaxFileSize=10MB
log4cplus.appender.ROLFILE.MaxBackupIndex=9
log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
......
SubSystems/Online_Cobalt/CMakeLists.txt
+ 1
− 1
View file @ 3eabeeea
......@@ -3,6 +3,6 @@
# Online_OutputProc is needed for tests on cbt nodes
# APLCommon is needed for the `swlevel' script
# PVSSGateway_Stub and Service_Broker are needed for the tRTmetadataToFile test
lofar_package(Online_Cobalt DEPENDS Cobalt Online_OutputProc APLCommon PVSSGateway_Stub Service_Broker)
lofar_package(Online_Cobalt DEPENDS Cobalt Online_OutputProc APLCommon PVSSGateway_Stub Service_Broker Log_Client)
add_subdirectory(test)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment