diff --git a/LCS/ACC/PLC/src/ProcControlServer.cc b/LCS/ACC/PLC/src/ProcControlServer.cc index 576ca9677ad447996acb0af3e64084b198a81c77..30f5b5b3dce6a6463fff0dbab7ca3fb11ad87c42 100644 --- a/LCS/ACC/PLC/src/ProcControlServer.cc +++ b/LCS/ACC/PLC/src/ProcControlServer.cc @@ -99,7 +99,7 @@ bool ProcControlServer::handleMessage(DH_ProcControl* theMsg) int16 cmdType = theMsg->getCommand(); string options = theMsg->getOptions(); LOG_DEBUG_STR("handleMessage: calling " << PCCmdName(theMsg->getCommand()) << - "(" << options << ")" << endl); + "(" << options << ")"); // setup control defaults bool sendAnswer = true; // assume that answer must be send diff --git a/LCS/Common/include/Common/LofarLog4Cplus.h b/LCS/Common/include/Common/LofarLog4Cplus.h index e6e5932e00a27ae03705d54ed6dffb52a39d3e66..7a4d68c5128965a8108fc03758a0dd2935f6e3e2 100644 --- a/LCS/Common/include/Common/LofarLog4Cplus.h +++ b/LCS/Common/include/Common/LofarLog4Cplus.h @@ -27,6 +27,7 @@ // Interface to the log4cplus logging package. //# Includes +#include <Common/CasaLogSink.h> #include <Common/lofar_iostream.h> #include <Common/lofar_sstream.h> #include <Common/lofar_string.h> @@ -63,11 +64,13 @@ namespace LOFAR { #define INIT_LOGGER(filename) \ do { \ ::LOFAR::initLog4Cplus(filename); \ + ::LOFAR::CasaLogSink::attach(); \ } while(0) #define INIT_VAR_LOGGER(filename,logfile) \ do { \ ::LOFAR::initLog4Cplus(filename, logfile); \ + ::LOFAR::CasaLogSink::attach(); \ } while(0) // After initialisation a thread is started to monitor any changes in the @@ -76,6 +79,7 @@ namespace LOFAR { # define INIT_LOGGER_AND_WATCH(filename,watchinterval) \ do { \ ::LOFAR::initLog4CplusAndWatch(filename, watchinterval); \ + ::LOFAR::CasaLogSink::attach(); \ } while(0) #else # define INIT_LOGGER_AND_WATCH(filename,watchinterval) INIT_LOGGER(filename) diff --git a/LCS/Common/include/Common/LofarLog4Cxx.h b/LCS/Common/include/Common/LofarLog4Cxx.h index 7d928e3ee075cc1184bd313afcfa7c68b35ed694..b4384970c932c803b3101c46402bd8be970eb896 100644 --- a/LCS/Common/include/Common/LofarLog4Cxx.h +++ b/LCS/Common/include/Common/LofarLog4Cxx.h @@ -27,6 +27,7 @@ // Interface to the log4cxx logging package. //# Includes +#include <Common/CasaLogSink.h> #include <Common/lofar_iostream.h> #include <Common/lofar_sstream.h> #include <Common/lofar_string.h> @@ -64,11 +65,13 @@ namespace LOFAR { #define INIT_LOGGER(filename) \ do { \ ::LOFAR::initLog4Cxx(filename); \ + ::LOFAR::CasaLogSink::attach(); \ } while(0) #define INIT_VAR_LOGGER(filename,logfile) \ do { \ ::LOFAR::initLog4Cxx(filename, logfile); \ + ::LOFAR::CasaLogSink::attach(); \ } while(0) // After initialisation a thread is started to monitor any changes in the @@ -77,6 +80,7 @@ namespace LOFAR { # define INIT_LOGGER_AND_WATCH(filename,watchinterval) \ do { \ ::LOFAR::initLog4CxxAndWatch(filename, watchinterval); \ + ::LOFAR::CasaLogSink::attach(); \ } while(0) #else # define INIT_LOGGER_AND_WATCH(filename,watchinterval) INIT_LOGGER(filename) diff --git a/LCS/Common/include/Common/LofarLogCout.h b/LCS/Common/include/Common/LofarLogCout.h index 8416619dc242499a11dd97118d91db7a43b660f2..70af56410224bd1b204766d041e4e4038be320bf 100644 --- a/LCS/Common/include/Common/LofarLogCout.h +++ b/LCS/Common/include/Common/LofarLogCout.h @@ -27,6 +27,7 @@ // Macro interface to the cout/cerr logging implementation. +#include <Common/CasaLogSink.h> #include <Common/lofar_iostream.h> #include <Common/lofar_sstream.h> #include <Common/lofar_iomanip.h> @@ -53,7 +54,10 @@ // - INIT_LOGGER_AND_WATCH // #define INIT_LOGGER(filename) \ - ::LOFAR::LFDebug::initLevels (::LOFAR::string(filename) + ".debug") + do { \ + ::LOFAR::LFDebug::initLevels (::LOFAR::string(filename) + ".debug"); \ + ::LOFAR::CasaLogSink::attach(); \ + } while(0) //# Note: 'var' logger functionality not available #define INIT_VAR_LOGGER(filename,logfile) \