Merge branch 'release/3.0.3'

IntegratedAlarmSystem-Group · Jun 18, 2018 · 4b3af21 · 4b3af21
2 parents 9ed96ab + 457c9f9
commit 4b3af21
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Converter/src/java/org/eso/ias/converter/ConverterConfig.java b/Converter/src/java/org/eso/ias/converter/ConverterConfig.java
@@ -58,7 +58,7 @@ public ConverterStream converterStream(String cID, Optional<String> kafkaBrokers
 	@Lazy(value = true)
 	public HbProducer hbProducer(String cID, Optional<String> kafkaBrokers, Properties props) { 
 		return new HbKafkaProducer(
-				cID, getKafkaServer(kafkaBrokers, props),
+				cID+"HBSender", getKafkaServer(kafkaBrokers, props),
 				new HbJsonSerializer()); 
 	}
 }
diff --git a/PythonPluginFeeder/src/java/org/eso/ias/plugin/network/UdpPlugin.java b/PythonPluginFeeder/src/java/org/eso/ias/plugin/network/UdpPlugin.java
@@ -206,7 +206,7 @@ public static void main(String[] args) {
 				pluginConfig.getSinkPort(), 
 				Plugin.getScheduledExecutorService());
 
-		HbProducer hbProducer = new HbKafkaProducer(pluginConfig.getId(), new HbJsonSerializer());
+		HbProducer hbProducer = new HbKafkaProducer(pluginConfig.getId()+"HBSender", new HbJsonSerializer());
 
 		UdpPlugin udpPlugin = null; 
 		try {

diff --git a/Supervisor/src/scala/org/eso/ias/supervisor/Supervisor.scala b/Supervisor/src/scala/org/eso/ias/supervisor/Supervisor.scala
@@ -397,7 +397,7 @@ object Supervisor {
     val hbProducer: HbProducer = {
       val kafkaServers = System.getProperties.getProperty(KafkaHelper.BROKERS_PROPNAME,KafkaHelper.DEFAULT_BOOTSTRAP_BROKERS)
 
-      new HbKafkaProducer(supervisorId,kafkaServers,new HbJsonSerializer())
+      new HbKafkaProducer(supervisorId+"HBSender",kafkaServers,new HbJsonSerializer())
     }
 
     // Build the supervisor

diff --git a/plugin/src/java/org/eso/ias/plugin/Plugin.java b/plugin/src/java/org/eso/ias/plugin/Plugin.java
@@ -373,20 +373,22 @@ public Plugin(
 		if (hbFrequency<=0) {
 			throw new IllegalArgumentException("The HB frequency must be >0");
 		}
+
+		flushProperties(props);
+
 		Objects.requireNonNull(hbProducer);
 		this.hbEngine=HbEngine.apply(pluginIdentifier.fullRunningID(), hbFrequency, hbProducer);		
 
-		flushProperties(props);
 		this.mpPublisher=sender;
 
 		/** check if the monitor point has the filter or if take global*/ 
 		values.forEach(v -> { 
 			try {
-				logger.info("ID: {}, filter: {}, filterOptions: {}",v.getId(),v.getFilter(),v.getFilterOptions());
-
 				MonitoredValue mv = null;
 
-				if (v.getFilter()==null && defaultFilter==null) {
+				if (
+						(v.getFilter()==null || v.getFilter().isEmpty()) && 
+						(defaultFilter==null || defaultFilter.isEmpty())) {
 					logger.info("No filter, neither default filter set for {}",v.getId());
 					mv = new MonitoredValue(
 							v.getId(),