Skip to content
Snippets Groups Projects
Commit 6b8ac3be authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Monitoring component:

- Removed unneeded initialization of Device component
parent 372bf3a4
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!45Bug fixes and improvements related to device configuration and monitoring
...@@ -17,8 +17,6 @@ from queue import Queue ...@@ -17,8 +17,6 @@ from queue import Queue
from typing import Iterator 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.logger import getJSONLogger
from common.proto.context_pb2 import Empty from common.proto.context_pb2 import Empty
from common.proto.device_pb2 import MonitoringSettings from common.proto.device_pb2 import MonitoringSettings
...@@ -50,20 +48,13 @@ METRICSDB_ILP_PORT = os.environ.get("METRICSDB_ILP_PORT") ...@@ -50,20 +48,13 @@ METRICSDB_ILP_PORT = os.environ.get("METRICSDB_ILP_PORT")
METRICSDB_REST_PORT = os.environ.get("METRICSDB_REST_PORT") METRICSDB_REST_PORT = os.environ.get("METRICSDB_REST_PORT")
METRICSDB_TABLE = os.environ.get("METRICSDB_TABLE") 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): class MonitoringServiceServicerImpl(MonitoringServiceServicer):
def __init__(self): def __init__(self):
LOGGER.info('Init monitoringService') LOGGER.info('Init monitoringService')
# Init sqlite monitoring db # Init sqlite monitoring db
self.management_db = ManagementDBTools.ManagementDB('monitoring.db') self.management_db = ManagementDBTools.ManagementDB('monitoring.db')
self.deviceClient = DeviceClient(host=DEVICESERVICE_SERVICE_HOST, self.deviceClient = DeviceClient()
port=DEVICESERVICE_SERVICE_PORT_GRPC) # instantiate the client
self.metrics_db = MetricsDBTools.MetricsDB(METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, self.metrics_db = MetricsDBTools.MetricsDB(METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT,
METRICSDB_TABLE) METRICSDB_TABLE)
self.subs_manager = SubscriptionManager(self.metrics_db) self.subs_manager = SubscriptionManager(self.metrics_db)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment