Merge "fix default properties"

3 files changed, 5 insertions, 4 deletions

diff --git a/etc/collector.properties b/etc/collector.properties
index c0db015f..ab5febc5 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -46,7 +46,7 @@ collector.schema.checkflag=1
 collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\"}

 

 ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile  

-collector.dmaap.streamid=fault=ves_fault,ves_fault_secondary|syslog=ves_syslog,ves_syslog_secondary|heartbeat=ves_heartbeat,ves_heartbeat_secondary|measurementsForVfScaling=ves_measurement,ves_measurement_secondary|mobileFlow=ves_mobileflow,ves_mobileflow_secondary|other=ves_other,ves_other_secondary|stateChange=ves_statechange,ves_statechange_secondary|thresholdCrossingAlert=ves_thresholdCrossingAlert,ves_thresholdCrossingAlert_secondary|voiceQuality=ves_voicequality,ves_voicequality_secondary|sipSignaling=ves_sipsignaling,ves_sipsignaling_secondary

+collector.dmaap.streamid=fault=ves_fault|syslog=ves_syslog|heartbeat=ves_heartbeat|measurementsForVfScaling=ves_measurement|mobileFlow=ves_mobileflow|other=ves_other|stateChange=ves_statechange|thresholdCrossingAlert=ves_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling

 collector.dmaapfile=./etc/DmaapConfig.json

 

 ## Custom ExceptionConfiguration

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
index 462287ef..d41cb23a 100644
--- a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
+++ b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
@@ -70,13 +70,14 @@ public class EventProcessor implements Runnable {
 		try {

 

 			event = CommonStartup.fProcessingInputQueue.take();

-			log.info("QueueSize:" + CommonStartup.fProcessingInputQueue.size()+  "\tEventProcessor\tRemoving element: " + event );

+			

 

 			// EventPublisher Ep=new EventPublisher();

 			while (event != null) {

 				// As long as the producer is running we remove elements from

 				// the queue.

-

+				log.info("QueueSize:" + CommonStartup.fProcessingInputQueue.size()+  "\tEventProcessor\tRemoving element: " + event );

+				

 				String uuid = event.get("VESuniqueId").toString();

 				LoggingContext localLC = VESLogger.getLoggingContextForThread(uuid);

 				localLC.put(EcompFields.kBeginTimestampMs, SaClock.now());

diff --git a/swagger_vescollector.yaml b/swagger_vescollector.yaml
index 6acae21e..7e27fad6 100644
--- a/swagger_vescollector.yaml
+++ b/swagger_vescollector.yaml
@@ -17,7 +17,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 swagger: '2.0'
 info:
-  version: 1.1.0
+  version: 1.2.0
   title: VES Collector
   description: >
     Virtual Event Streaming (VES) Collector is RESTful collector for processing