Commit b8435eb3 authored by Gino Tosti's avatar Gino Tosti
Browse files

minor changes, added logger

parent 10282f18

monitorCollectorJava/idl/MonitorCollector.idl

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ typedef sequence<propertySerailNumber> propertySerialNumberSeq; 
    	raises (MonitorErr::DeviceAlreadyRegisteredEx, MonitorErr::RegisteringDeviceProblemEx); /// Called by device (MonCol gets non-sticky reference)

    	

	void registerMonitoredDeviceWithMultipleSerial(in string componentName, in  propertySerialNumberSeq serialNumbers) 

    	raises (MonitorErr::DeviceAlreadyRegisteredEx, MonitorErr::RegisteringDeviceProblemEx); /// Called by device (MonCol gets non-sticky reference)



		void registerNonCollocatedMonitoredDeviceWithMultipleSerial(in string componentName, in  propertySerialNumberSeq serialNumbers) 

    	raises (MonitorErr::DeviceAlreadyRegisteredEx, MonitorErr::RegisteringDeviceProblemEx); /// Called by device (MonCol gets non-sticky reference)

 	void registerNonCollocatedMonitoredDevice(in string componentName, in  string serialNumbers) 

    	raises (MonitorErr::DeviceAlreadyRegisteredEx, MonitorErr::RegisteringDeviceProblemEx); /// Called by device (MonCol gets non-sticky reference)

    	    	

    void deregisterMonitoredDevice(in string componentName)

monitorCollectorJava/src/alma/TMCDB/MonitorCollectorImpl/MPboolean.java

+11 −10
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import alma.JavaContainerError.wrappers.AcsJContainerServicesEx; 
import alma.TMCDB.MonitorBlob;

import alma.TMCDB.booleanBlobData;

import alma.TMCDB.booleanBlobDataSeqHelper;

import alma.TMCDB.stringBlobData;

import alma.acs.container.ContainerServices;



public class MPboolean extends MonitorPointHelper implements CBbooleanOperations {
@@ -58,19 +59,17 @@ public class MPboolean extends MonitorPointHelper implements CBbooleanOperations 
	        // This log is commented because of operational constraints that are currently using 'debug' as operation log setting

	        //ACS_SHORT_LOG((LM_DEBUG, "Adding data to buffer"));

	        // Add data to current position

//	    	longBlobData a = new longBlobData();

//			a.value = value;

//			a.time = c.timeStamp;

//			blobDataSeq_m[curSeqPos_m] = a;

			blobDataSeq_m[curSeqPos_m].value = value;

			blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

	    	booleanBlobData a = new booleanBlobData();

			a.value = value;

			a.time = c.timeStamp;

			blobDataSeq_m[curSeqPos_m] = a;

	        // Increment current position pointer

	    	System.out.print("--->Received:"+value);

	    	m_logger.info("--->Received:"+value);

	        curSeqPos_m++;

	        // Increment initial position pointer if buffer is full

	        if (bufferFull)

	        {

	        	System.out.println("Data lost from buffer");

	        	m_logger.warning("Data lost from buffer");

	            curSeqInit_m++;

	        }

	    }
@@ -84,8 +83,10 @@ public class MPboolean extends MonitorPointHelper implements CBbooleanOperations 
	            // Reset buffer current position

	            curSeqPos_m = 0;

	            // Add data to current position

	            blobDataSeq_m[curSeqPos_m].value = value;

		        blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

		    	booleanBlobData a = new booleanBlobData();

				a.value = value;

				a.time = c.timeStamp;

				blobDataSeq_m[curSeqPos_m] = a;

		        // Increment current position pointer

	            curSeqPos_m++;

	    }

monitorCollectorJava/src/alma/TMCDB/MonitorCollectorImpl/MPlong.java

+17 −16
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ import alma.TMCDB.MonitorBlob; 
import alma.TMCDB.longBlobData;

import alma.TMCDB.longBlobDataSeqHelper;

import alma.acs.container.ContainerServices;

import alma.acs.logging.AcsLogLevel;



public class MPlong extends MonitorPointHelper implements CBlongOperations {
@@ -44,35 +45,33 @@ public class MPlong extends MonitorPointHelper implements CBlongOperations { 
		}

		catch(Exception ex)

		{

			m_logger.info("no such Characteristic for"+ex.getMessage());

			m_logger.warning("no such Characteristic:"+ex.getMessage());

		}

		

		m_logger.info("INIZIALIZZATA COMPONENTE "+propertyName);

		m_logger.log(AcsLogLevel.DEBUG,"INIZIALIZZATA COMPONENTE "+propertyName);

	}



	@Override

	public void working(int value, Completion c, CBDescOut desc) {

		m_logger.info("---->Working on:"+propertyName_m);

		m_logger.log(AcsLogLevel.DEBUG,"---->Working on:"+propertyName_m);

	    // Still place in current available buffer segments

		m_logger.info("--->Received:"+value);

		m_logger.log(AcsLogLevel.DEBUG,"--->Received:"+value);

	    if ( curSeqPos_m < seqLen_m )

	    {

	        // This log is commented because of operational constraints that are currently using 'debug' as operation log setting

	        //ACS_SHORT_LOG((LM_DEBUG, "Adding data to buffer"));

	        // Add data to current position

//	    	longBlobData a = new longBlobData();

//			a.value = value;

//			a.time = c.timeStamp;

//			blobDataSeq_m[curSeqPos_m] = a;

			blobDataSeq_m[curSeqPos_m].value = value;

			blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

	    	longBlobData a = new longBlobData();

			a.value = value;

			a.time = c.timeStamp;

			blobDataSeq_m[curSeqPos_m] = a;

	        // Increment current position pointer

	    	System.out.print("--->Received:"+value);

	    	m_logger.info("Received:"+value);

	        curSeqPos_m++;

	        // Increment initial position pointer if buffer is full

	        if (bufferFull)

	        {

	        	System.out.println("Data lost from buffer");

	        	m_logger.warning("Data lost from buffer");

	            curSeqInit_m++;

	        }

	    }
@@ -86,8 +85,10 @@ public class MPlong extends MonitorPointHelper implements CBlongOperations { 
	            // Reset buffer current position

	            curSeqPos_m = 0;

	            // Add data to current position

	            blobDataSeq_m[curSeqPos_m].value = value;

		        blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

		    	longBlobData a = new longBlobData();

				a.value = value;

				a.time = c.timeStamp;

				blobDataSeq_m[curSeqPos_m] = a;

		        // Increment current position pointer

	            curSeqPos_m++;

	    }
@@ -108,7 +109,7 @@ public class MPlong extends MonitorPointHelper implements CBlongOperations { 
		        //blobDataSeq_m =new doubleBlobData[curSeqPos_m];

				longBlobData[] tmpBlobDataSeq = new longBlobData[curSeqPos_m];

				for (int i = 0; i < curSeqPos_m; i++) {

					m_logger.info("1---> BlobDataSeq "+blobDataSeq_m[i].time+" "+blobDataSeq_m[i].value);

					m_logger.log(AcsLogLevel.DEBUG,"1---> BlobDataSeq "+blobDataSeq_m[i].time+" "+blobDataSeq_m[i].value);

					tmpBlobDataSeq[i] = blobDataSeq_m[i];

				}

				longBlobDataSeqHelper.insert(monitorBlob_m.blobDataSeq, tmpBlobDataSeq);
@@ -116,7 +117,7 @@ public class MPlong extends MonitorPointHelper implements CBlongOperations { 
		    }else {

		    	longBlobData[] tmpBlobDataSeq = new longBlobData[curSeqPos_m];

				for (int i = 0; i < curSeqPos_m; i++) {

					m_logger.info("2---> BlobDataSeq "+i+" "+blobDataSeq_m[i].time+" "+blobDataSeq_m[i].value);

					m_logger.log(AcsLogLevel.DEBUG,"2---> BlobDataSeq "+i+" "+blobDataSeq_m[i].time+" "+blobDataSeq_m[i].value);

					tmpBlobDataSeq[i] = blobDataSeq_m[(i+curSeqInit_m)%seqLen_m];

				}

				longBlobDataSeqHelper.insert(monitorBlob_m.blobDataSeq, tmpBlobDataSeq);

monitorCollectorJava/src/alma/TMCDB/MonitorCollectorImpl/MPlongLong.java

+10 −9
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import alma.ACS.ROlongLongHelper; 
import alma.ACSErr.Completion;

import alma.JavaContainerError.wrappers.AcsJContainerServicesEx;

import alma.TMCDB.MonitorBlob;

import alma.TMCDB.longBlobData;

import alma.TMCDB.longLongBlobData;

import alma.TMCDB.longLongBlobDataSeqHelper;

import alma.acs.container.ContainerServices;
@@ -60,14 +61,12 @@ public class MPlongLong extends MonitorPointHelper implements CBlongLongOperatio 
	        // This log is commented because of operational constraints that are currently using 'debug' as operation log setting

	        //ACS_SHORT_LOG((LM_DEBUG, "Adding data to buffer"));

	        // Add data to current position

//	    	longBlobData a = new longBlobData();

//			a.value = value;

//			a.time = c.timeStamp;

//			blobDataSeq_m[curSeqPos_m] = a;

			blobDataSeq_m[curSeqPos_m].value = value;

			blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

	    	longLongBlobData a = new longLongBlobData();

			a.value = value;

			a.time = c.timeStamp;

			blobDataSeq_m[curSeqPos_m] = a;

	        // Increment current position pointer

	    	System.out.print("--->Received:"+value);

	    	m_logger.info("--->Received:"+value);

	        curSeqPos_m++;

	        // Increment initial position pointer if buffer is full

	        if (bufferFull)
@@ -86,8 +85,10 @@ public class MPlongLong extends MonitorPointHelper implements CBlongLongOperatio 
	            // Reset buffer current position

	            curSeqPos_m = 0;

	            // Add data to current position

	            blobDataSeq_m[curSeqPos_m].value = value;

		        blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

		    	longLongBlobData a = new longLongBlobData();

				a.value = value;

				a.time = c.timeStamp;

				blobDataSeq_m[curSeqPos_m] = a;

		        // Increment current position pointer

	            curSeqPos_m++;

	    }

monitorCollectorJava/src/alma/TMCDB/MonitorCollectorImpl/MPstring.java

+11 −10
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import alma.JavaContainerError.wrappers.AcsJContainerServicesEx; 
import alma.TMCDB.MonitorBlob;

import alma.TMCDB.booleanBlobData;

import alma.TMCDB.booleanBlobDataSeqHelper;

import alma.TMCDB.longBlobData;

import alma.TMCDB.stringBlobData;

import alma.TMCDB.stringBlobDataSeqHelper;

import alma.acs.container.ContainerServices;
@@ -65,19 +66,17 @@ public class MPstring extends MonitorPointHelper implements CBstringOperations { 
	        // This log is commented because of operational constraints that are currently using 'debug' as operation log setting

	        //ACS_SHORT_LOG((LM_DEBUG, "Adding data to buffer"));

	        // Add data to current position

//	    	longBlobData a = new longBlobData();

//			a.value = value;

//			a.time = c.timeStamp;

//			blobDataSeq_m[curSeqPos_m] = a;

			blobDataSeq_m[curSeqPos_m].value = value;

			blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

	    	stringBlobData a = new stringBlobData();

			a.value = value;

			a.time = c.timeStamp;

			blobDataSeq_m[curSeqPos_m] = a;

	        // Increment current position pointer

	    	System.out.print("--->Received:"+value);

	    	m_logger.info("--->Received:"+value);

	        curSeqPos_m++;

	        // Increment initial position pointer if buffer is full

	        if (bufferFull)

	        {

	        	System.out.println("Data lost from buffer");

	        	m_logger.info("Data lost from buffer");

	            curSeqInit_m++;

	        }

	    }
@@ -91,8 +90,10 @@ public class MPstring extends MonitorPointHelper implements CBstringOperations { 
	            // Reset buffer current position

	            curSeqPos_m = 0;

	            // Add data to current position

	            blobDataSeq_m[curSeqPos_m].value = value;

		        blobDataSeq_m[curSeqPos_m].time = c.timeStamp;

		    	stringBlobData a = new stringBlobData();

				a.value = value;

				a.time = c.timeStamp;

				blobDataSeq_m[curSeqPos_m] = a;

		        // Increment current position pointer

	            curSeqPos_m++;

	    }