From 226fe582b66677e286cf6d66efcdddc69b898351 Mon Sep 17 00:00:00 2001
From: Dollerino <dollerok101@gmail.com>
Date: Thu, 19 Sep 2024 18:20:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-901=20(=D0=94=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BA=D0=BE=D0=BB=D0=BE=D0=B2=20MQTT=20=D0=B8=20KA?=
 =?UTF-8?q?FKA)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js               | 2 ++
 core/kafka_connector.js | 2 +-
 core/mqtt_connector.js  | 9 +++------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config.js b/config.js
index fa73f2f..edea45f 100644
--- a/config.js
+++ b/config.js
@@ -77,6 +77,8 @@ let kafkaConnection = {
     sClientIdSender: "Parus",
     //ID клиента-получателя
     sClientIdRecipient: "Parus",
+    //Группа получателя
+    sGroupId: "Parus",
     //Время ожидания успешного подключения (мс)
     nConnectionTimeout: 5000,
     //Необходимость попытки переподключения при потере соединения
diff --git a/core/kafka_connector.js b/core/kafka_connector.js
index 5ee2841..be09621 100644
--- a/core/kafka_connector.js
+++ b/core/kafka_connector.js
@@ -71,7 +71,7 @@ const subscribeKafka = async ({ connectionPrms, service, processKafkaMessage, lo
         });
 
         //Инициализируем получателя
-        let consumer = client.consumer({ groupId: "ParusWebApi" });
+        let consumer = client.consumer({ groupId: connectionPrms.sGroupId });
 
         //Устанавливаем прослушивание
         await consumer.connect();
diff --git a/core/mqtt_connector.js b/core/mqtt_connector.js
index 90c929a..f63f226 100644
--- a/core/mqtt_connector.js
+++ b/core/mqtt_connector.js
@@ -50,12 +50,9 @@ const subscribeMQTT = async ({ connectionPrms, service, processMQTTMessage, logg
         });
 
         //Обходим функции сервиса
-        _.forEach(
-            _.filter(service.functions, fn => !fn.sFnURL.startsWith("@")),
-            fn => {
-                client.subscribe(fn.sFnURL);
-            }
-        );
+        _.forEach(service.functions, fn => {
+            client.subscribe(fn.sFnURL);
+        });
 
         //Прослушиваем сообщения
         client.on("message", (topic, message) => {