diff --git a/.gitattributes b/.gitattributes index 425ff7e38265f8f92f1582ca9922abd5080a3f72..1954181cc8c37f05bbede1a26d20401a9e36c78e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -367,7 +367,6 @@ MAC/GCF/GCFCommon/configure.in -text svneol=native#application/octet-stream MAC/GCF/GCFCommon/pvss/scripts/libs/gcf-common.ctl -text svneol=native#application/octet-stream MAC/GCF/GCFCommon/src/Makefile.am -text svneol=native#application/octet-stream MAC/GCF/LogSys/CLP/Makefile.am -text svneol=native#application/octet-stream -MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.conf.in -text svneol=native#application/octet-stream MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.log_prop.in -text svneol=native#application/octet-stream MAC/GCF/LogSys/CLP/src/Makefile.am -text svneol=native#application/octet-stream MAC/GCF/LogSys/KVLogSys/Makefile.am -text svneol=native#application/octet-stream diff --git a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.conf.in b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.conf.in deleted file mode 100644 index 4962465a420b7609aa532f3d4edc409c6680ef33..0000000000000000000000000000000000000000 --- a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.conf.in +++ /dev/null @@ -1,3 +0,0 @@ -mac.ns.GCF-CLPD.server.type=TCP -mac.ns.GCF-CLPD.server.port=25003 -mac.ns.GCF-CLPD.server.host=lofar35 diff --git a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.log_prop.in b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.log_prop.in index d15e10ab5a6f43156134697bb06bd0ab395c93ce..e7994debd1b27330525c329a1ebab9ba2e8062b1 100644 --- a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.log_prop.in +++ b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.log_prop.in @@ -11,7 +11,7 @@ log4cplus.appender.MACSTDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p log4cplus.appender.MACSTDERR.logToStdErr=true log4cplus.appender.FILE=log4cplus::RollingFileAppender -log4cplus.appender.FILE.File=../var/log/CodeLoggingProcessor.log +log4cplus.appender.FILE.File=../log/CodeLoggingProcessor.log log4cplus.appender.FILE.MaxFileSize=10MB log4cplus.appender.FILE.MaxBackupIndex=10 log4cplus.appender.FILE.layout=log4cplus::PatternLayout @@ -20,4 +20,4 @@ log4cplus.appender.FILE.logToStdErr=true log4cplus.additivity.MAC=FALSE log4cplus.logger.MAC=DEBUG, FILE -log4cplus.logger.TRC=TRACE8, FILE \ No newline at end of file +log4cplus.logger.TRC=TRACE8, FILE diff --git a/MAC/GCF/LogSys/CLP/src/Makefile.am b/MAC/GCF/LogSys/CLP/src/Makefile.am index e6dd429d2b690e0e66a5f1fd9d10178efcba6d8d..8aa473db01a41215832e335256faa8afec4b4cc5 100644 --- a/MAC/GCF/LogSys/CLP/src/Makefile.am +++ b/MAC/GCF/LogSys/CLP/src/Makefile.am @@ -1,31 +1,28 @@ -DOCHDRS = \ - CodeLoggingProcessor.h \ - PropertyProxy.h +DOCHDRS = CodeLoggingProcessor.h \ + PropertyProxy.h -noinst_LTLIBRARIES = libclp.la +noinst_LTLIBRARIES = libclp.la -libclp_la_SOURCES = $(DOCHDRS) \ - CodeLoggingProcessor.cc \ - PropertyProxy.cc +libclp_la_SOURCES = $(DOCHDRS) \ + CodeLoggingProcessor.cc \ + PropertyProxy.cc -libclp_la_LIBADD = -AM_CPPFLAGS= -DLOFARLOGGER_SUBPACKAGE=\"CLP\" +libclp_la_LIBADD = +AM_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"CLP\" -bin_PROGRAMS = CodeLoggingProcessor +bin_PROGRAMS = CodeLoggingProcessor -CodeLoggingProcessor_SOURCES = CLPMain.cc +CodeLoggingProcessor_SOURCES = CLPMain.cc CodeLoggingProcessor_LDADD = libclp.la $(LOFAR_DEPEND) \ - $(top_builddir)/KVLogSys/src/libgcfkvlc.la + $(top_builddir)/KVLogSys/src/libgcfkvlc.la CodeLoggingProcessor_DEPENDENCIES = libclp.la $(LOFAR_DEPEND) \ - $(top_builddir)/KVLogSys/src/libgcfkvlc.la + $(top_builddir)/KVLogSys/src/libgcfkvlc.la -BUILT_SOURCES = +BUILT_SOURCES = -EXTRA_DIST = $(sysconf_DATA) +EXTRA_DIST = $(sysconf_DATA) -sysconf_DATA= \ - CodeLoggingProcessor.conf \ - CodeLoggingProcessor.log_prop +sysconf_DATA = CodeLoggingProcessor.log_prop %.conf: %.conf.in cp $< $@ diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc index a19af266ae5f4b96188e2eb249f76fcf0a0bd454..09d5fe81a4c7f5399a808f98f1795942d97de802 100644 --- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc +++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc @@ -30,8 +30,8 @@ #include <GCF/GCF_ServiceInfo.h> #include <GCF/TM/GCF_Protocols.h> #include <GCF/PAL/GCF_Answer.h> -#include <GCF/PAL/GCF_PVSSInfo.h> -#include <ManagerIdentifier.hxx> +//#include <GCF/PAL/GCF_PVSSInfo.h> +//#include <ManagerIdentifier.hxx> namespace LOFAR { using TYPES::uint8; @@ -51,7 +51,7 @@ KeyValueLoggerDaemon::KeyValueLoggerDaemon() : _registerID (0), _curSeqNr (0), _oldestUnanswerdSeqNr (1), - _propertyLogger (*this), +// _propertyLogger (*this), _waitForAnswer (false) { // register the protocol for debugging purposes @@ -181,7 +181,7 @@ GCFEvent::TResult KeyValueLoggerDaemon::operational(GCFEvent& event, } else { _clientsGarbage.push_back(&port); - _propertyLogger.clientGone(port); +// _propertyLogger.clientGone(port); } break; @@ -274,6 +274,7 @@ GCFEvent::TResult KeyValueLoggerDaemon::operational(GCFEvent& event, break; } +#if 0 case F_VCHANGEMSG: { if (hourTimerID == -2) { LOG_DEBUG("More than 1 hour no connection with the master, so dump all receiving key value updates."); @@ -309,6 +310,7 @@ GCFEvent::TResult KeyValueLoggerDaemon::operational(GCFEvent& event, } break; } +#endif case KVL_ANSWER: { KVLAnswerEvent answer(event); @@ -329,7 +331,7 @@ GCFEvent::TResult KeyValueLoggerDaemon::operational(GCFEvent& event, case KVL_SKIP_UPDATES_FROM: { KVLSkipUpdatesFromEvent request(event); - _propertyLogger.skipUpdatesFrom(request.man_id, port); +// _propertyLogger.skipUpdatesFrom(request.man_id, port); break; } diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h index d738c0e035a7f2b6873be06efac88f3b14c2965f..f26ca7c2ad4a0a7ba4641da3637c7057cb522b04 100644 --- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h +++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h @@ -28,7 +28,7 @@ #include <GCF/TM/GCF_TCPPort.h> #include <KVL_Protocol.ph> #include <KVLDefines.h> -#include <PropertyLogger.h> +//#include <PropertyLogger.h> namespace LOFAR { namespace GCF { @@ -67,7 +67,7 @@ private: uint8 _registerID; uint64 _curSeqNr; uint64 _oldestUnanswerdSeqNr; - PropertyLogger _propertyLogger; +// PropertyLogger _propertyLogger; bool _waitForAnswer; }; diff --git a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am index c621feae927de9b4dcea2324793583476d561aa4..4a9be72d86d79c42a8941ea205511e522d2e22eb 100644 --- a/MAC/GCF/LogSys/KVLogSys/src/Makefile.am +++ b/MAC/GCF/LogSys/KVLogSys/src/Makefile.am @@ -8,8 +8,8 @@ DOCHDRS = KVLDefines.h \ KeyValueLoggerDaemon.h \ KeyValueLoggerMaster.h \ KVLUtils.h \ - PropertyLogger.h \ $(BUILT_SOURCES) +# PropertyLogger.h bin_PROGRAMS = KeyValueLoggerDaemon KeyValueLoggerMaster lib_LTLIBRARIES = libgcfkvlc.la libcepkvlc.la @@ -29,8 +29,8 @@ libkvlprot_la_SOURCES = $(DOCHDRS) \ KVLUtils.cc libkvld_la_SOURCES = $(DOCHDRS) \ - KeyValueLoggerDaemon.cc \ - PropertyLogger.cc + KeyValueLoggerDaemon.cc +# PropertyLogger.cc libkvld_la_LIBADD = libkvlprot.la libkvld_la_CPPFLAGS = -DLOFARLOGGER_SUBPACKAGE=\"KVLD\" diff --git a/MAC/GCF/LogSys/Makefile.am b/MAC/GCF/LogSys/Makefile.am index ede9a80e924f48e8c2184397704225199c8a343f..f79eb75fc1de1de7079056e28fd46394ecf4346e 100644 --- a/MAC/GCF/LogSys/Makefile.am +++ b/MAC/GCF/LogSys/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS=KVLogSys CLP include -pkgextdir = $(prefix)/config/$(PACKAGE) -pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags +#pkgextdir = $(prefix)/config/$(PACKAGE) +#pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags #DISTCHECK_CONFIGURE_FLAGS=\ # --with-common=$(prefix) # "common" is an example