BugID: 1014

Removed link to PVSS in KetValueLoggerDaemon.

.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

MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.conf.in

-mac.ns.GCF-CLPD.server.type=TCP
-mac.ns.GCF-CLPD.server.port=25003
-mac.ns.GCF-CLPD.server.host=lofar35

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

MAC/GCF/LogSys/CLP/src/Makefile.am

-DOCHDRS	=	\
-	CodeLoggingProcessor.h \
+DOCHDRS								= CodeLoggingProcessor.h \
 									  PropertyProxy.h
    
 noinst_LTLIBRARIES 					= libclp.la
@@ -23,9 +22,7 @@ BUILT_SOURCES =
 
 EXTRA_DIST 							= $(sysconf_DATA)
 
-sysconf_DATA= \
-	CodeLoggingProcessor.conf \
-	CodeLoggingProcessor.log_prop
+sysconf_DATA						= CodeLoggingProcessor.log_prop
 	
 %.conf: %.conf.in
 	cp $< $@

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;
 	}
 

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;
     
 };

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\"
 

MAC/GCF/LogSys/Makefile.am

 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