From 1ca10063ff0993bc38c78f96e96babb533038162 Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Sat, 18 Mar 2017 00:05:35 +0000
Subject: [PATCH] Task #9939: Cobalt: refer send_state, getOutputProcHosts and
gpu_load to rtcp.log_prop. Intention is to get rid of send_state log4cplus
bogus WARN in (inspection plots filtered) log files
---
RTCP/Cobalt/GPUProc/src/CMakeLists.txt | 1 -
RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc | 4 +-
.../GPUProc/src/getOutputProcHosts.log_prop | 45 -------------------
RTCP/Cobalt/GPUProc/src/gpu_load.cc | 2 +-
RTCP/Cobalt/GPUProc/src/send_state.cc | 2 +-
5 files changed, 4 insertions(+), 50 deletions(-)
delete mode 100644 RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop
diff --git a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
index 6c839a1c517..aafc3ad71e0 100644
--- a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
@@ -145,7 +145,6 @@ lofar_add_sbin_scripts(
# install logprop files
install(FILES
rtcp.log_prop
- getOutputProcHosts.log_prop
Station/mpi_node_list.log_prop
Station/station_stream.log_prop
scripts/watchlogs-multitail.conf
diff --git a/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc b/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc
index 873c960b5fc..8be4a02b02f 100644
--- a/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc
+++ b/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
exit(1);
}
- INIT_LOGGER("getOutputProcHosts");
+ INIT_LOGGER("rtcp"); // reuse rtcp.log_prop
// Open the parset
Parset ps(argv[optind]);
@@ -79,4 +79,4 @@ int main(int argc, char **argv)
}
return 0;
- }
\ No newline at end of file
+ }
diff --git a/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop b/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop
deleted file mode 100644
index 0016d5546dc..00000000000
--- a/RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# Configure the loggers
-
-# logging to the MACCLP socket appender.
-log4cplus.rootLogger=INFO, STDERR
-log4cplus.logger.TRC=INFO
-
-# prevent debug messages: accept >=WARN only, and don't forward messages to the rootLogger
-log4cplus.logger.LCS.ApplCommon=WARN, STDERR
-log4cplus.additivity.LCS.ApplCommon=false
-log4cplus.logger.LCS.MSLofar=WARN, STDERR
-log4cplus.additivity.LCS.MSLofar=false
-
-# Logging to console
-
-log4cplus.appender.STDERR=log4cplus::ConsoleAppender
-log4cplus.appender.STDERR.layout=log4cplus::PatternLayout
-log4cplus.appender.STDERR.layout.ConversionPattern=getOutputProcHosts@%h %D{%Y-%m-%d %H:%M:%S.%q} %-5p %c{3} - %m [%b:%L]%n
-log4cplus.appender.STDERR.logToStdErr=true
-
-# Logging to logging server on CCU001
-# HERE BE DRAGONS: Do NOT set the logging threshold for the MACCLP appender
-# above INFO in the log_prop file, or identification with the MAC Log Processor
-# will fail!
-#
-# JD: Disabled for now, as log4cplus uses extra threads for this, which in turn
-# cause crashes in OpenMPI.
-#log4cplus.appender.MACCLP=log4cplus::SocketAppender
-#log4cplus.appender.MACCLP.port=23999
-#log4cplus.appender.MACCLP.host=ccu001
-#log4cplus.appender.MACCLP.Threshold=INFO
-
-#log4cplus.appender.STDERR=log4cplus::ConsoleAppender
-#log4cplus.appender.STDERR.layout=log4cplus::PatternLayout
-#log4cplus.appender.STDERR.layout.ConversionPattern=getOutputProcHosts@%h %D{%Y-%m-%d %H:%M:%S.%q} %-5p %c{3} - %m [%b:%L]%n
-#log4cplus.appender.STDERR.logToStdErr=true
-
-#log4cplus.appender.FILE=log4cplus::RollingFileAppender
-#log4cplus.appender.FILE.File=${LOG4CPLUS_LOGFILENAME}.log
-#log4cplus.appender.FILE.MaxFileSize=10MB
-#log4cplus.appender.FILE.MaxBackupIndex=2
-#log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-#log4cplus.appender.FILE.layout.ConversionPattern=getOutputProcHosts@%h %D{%Y-%m-%d %H:%M:%S.%q} %-5p %c{3} - %m [%b:%L]%n
-
-log4cplus.appender.DUMP=log4cplus::NullAppender
diff --git a/RTCP/Cobalt/GPUProc/src/gpu_load.cc b/RTCP/Cobalt/GPUProc/src/gpu_load.cc
index b1721d8e0f1..9f708d302a6 100644
--- a/RTCP/Cobalt/GPUProc/src/gpu_load.cc
+++ b/RTCP/Cobalt/GPUProc/src/gpu_load.cc
@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
return 1;
}
- INIT_LOGGER("gpu_load");
+ INIT_LOGGER("rtcp"); // reuse rtcp.log_prop
Parset ps(argv[1]);
diff --git a/RTCP/Cobalt/GPUProc/src/send_state.cc b/RTCP/Cobalt/GPUProc/src/send_state.cc
index ffe247badac..0332bf76ca1 100644
--- a/RTCP/Cobalt/GPUProc/src/send_state.cc
+++ b/RTCP/Cobalt/GPUProc/src/send_state.cc
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
if (setenv("TZ", "UTC", 1) < 0)
THROW_SYSCALL("setenv(TZ)");
- INIT_LOGGER("send_status");
+ INIT_LOGGER("rtcp"); // reuse rtcp.log_prop
MessageBus::init();
// Parse parset RAW to prevent exceptions caused by broken parsets.
--
GitLab