From 6b8ac3be736ec2aaddc4e47f05d788263e8800f1 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 30 Jan 2023 14:28:37 +0000
Subject: [PATCH] Monitoring component:
- Removed unneeded initialization of Device component
---
.../service/MonitoringServiceServicerImpl.py | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index c2bceefd7..99bed8f4d 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -17,8 +17,6 @@ from queue import Queue
from typing import Iterator
-from common.Constants import ServiceNameEnum
-from common.Settings import get_setting, get_service_port_grpc, get_service_host
from common.logger import getJSONLogger
from common.proto.context_pb2 import Empty
from common.proto.device_pb2 import MonitoringSettings
@@ -50,20 +48,13 @@ METRICSDB_ILP_PORT = os.environ.get("METRICSDB_ILP_PORT")
METRICSDB_REST_PORT = os.environ.get("METRICSDB_REST_PORT")
METRICSDB_TABLE = os.environ.get("METRICSDB_TABLE")
-DEVICESERVICE_SERVICE_HOST = get_setting('DEVICESERVICE_SERVICE_HOST', default=get_service_host(ServiceNameEnum.DEVICE))
-DEVICESERVICE_SERVICE_PORT_GRPC = get_setting('DEVICESERVICE_SERVICE_PORT_GRPC',
- default=get_service_port_grpc(ServiceNameEnum.DEVICE))
-
-
class MonitoringServiceServicerImpl(MonitoringServiceServicer):
def __init__(self):
LOGGER.info('Init monitoringService')
# Init sqlite monitoring db
self.management_db = ManagementDBTools.ManagementDB('monitoring.db')
- self.deviceClient = DeviceClient(host=DEVICESERVICE_SERVICE_HOST,
- port=DEVICESERVICE_SERVICE_PORT_GRPC) # instantiate the client
-
+ self.deviceClient = DeviceClient()
self.metrics_db = MetricsDBTools.MetricsDB(METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT,
METRICSDB_TABLE)
self.subs_manager = SubscriptionManager(self.metrics_db)
--
GitLab