From 457c9f9a2b4303bee791a69da31040dcb39fe8ae Mon Sep 17 00:00:00 2001 From: Alessandro Caproni Date: Mon, 18 Jun 2018 13:33:53 -0400 Subject: [PATCH] Renames the client.id used by the kafka producers @see #110 --- Converter/src/java/org/eso/ias/converter/ConverterConfig.java | 2 +- .../src/java/org/eso/ias/plugin/network/UdpPlugin.java | 2 +- Supervisor/src/scala/org/eso/ias/supervisor/Supervisor.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Converter/src/java/org/eso/ias/converter/ConverterConfig.java b/Converter/src/java/org/eso/ias/converter/ConverterConfig.java index bba6d180a..8b7a36446 100644 --- 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 kafkaBrokers @Lazy(value = true) public HbProducer hbProducer(String cID, Optional 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 index bd50f0ced..e8b2e03f1 100644 --- 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 index a5405b1df..f1c086f46 100644 --- 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