Task #9939: undo r36882 using reverse merge. Intended to fix Cobalt regression tests breakage.

RTCP/Cobalt/GPUProc/src/CMakeLists.txt

@@ -145,6 +145,7 @@ 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

RTCP/Cobalt/GPUProc/src/getOutputProcHosts.cc

@@ -65,7 +65,7 @@ int main(int argc, char **argv)
     exit(1);
   }
 
-  INIT_LOGGER("rtcp"); // reuse rtcp.log_prop
+  INIT_LOGGER("getOutputProcHosts");
 
   // Open the parset
   Parset ps(argv[optind]);

RTCP/Cobalt/GPUProc/src/getOutputProcHosts.log_prop

+
+# 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

RTCP/Cobalt/GPUProc/src/gpu_load.cc

@@ -47,7 +47,7 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  INIT_LOGGER("rtcp"); // reuse rtcp.log_prop
+  INIT_LOGGER("gpu_load");
 
   Parset ps(argv[1]);
 

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("rtcp"); // reuse rtcp.log_prop
+  INIT_LOGGER("send_status");
   MessageBus::init();
 
   // Parse parset RAW to prevent exceptions caused by broken parsets.