From 9e2266258226df312ef67b65b781dc3b1dc07459 Mon Sep 17 00:00:00 2001 From: Waleed Akbar <wakbar@cttc.es> Date: Sat, 7 Sep 2024 14:30:55 +0000 Subject: [PATCH] Changes in Telemetry Service **Frontend:** - Deleted irrelevant lines. **Backend:** - Added `delete_db_row_by_id` in the Stop Collector method. --- src/telemetry/backend/service/TelemetryBackendService.py | 2 -- .../service/TelemetryFrontendServiceServicerImpl.py | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/telemetry/backend/service/TelemetryBackendService.py b/src/telemetry/backend/service/TelemetryBackendService.py index bb9f0a314..5276c2be3 100755 --- a/src/telemetry/backend/service/TelemetryBackendService.py +++ b/src/telemetry/backend/service/TelemetryBackendService.py @@ -32,8 +32,6 @@ from common.tools.service.GenericGrpcService import GenericGrpcService LOGGER = logging.getLogger(__name__) METRICS_POOL = MetricsPool('TelemetryBackend', 'backendService') -# EXPORTER_ENDPOINT = "http://10.152.183.2:9100/metrics" - class TelemetryBackendService(GenericGrpcService): """ diff --git a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py index 2b872dba3..b73d9fa95 100644 --- a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py +++ b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py @@ -89,7 +89,14 @@ class TelemetryFrontendServiceServicerImpl(TelemetryFrontendServiceServicer): request : CollectorId, grpc_context: grpc.ServicerContext # type: ignore ) -> Empty: # type: ignore LOGGER.info ("gRPC message: {:}".format(request)) - self.PublishStopRequestOnKafka(request) + try: + collector_to_delete = request.collector_id.uuid + self.tele_db_obj.delete_db_row_by_id( + CollectorModel, "collector_id", collector_to_delete + ) + self.PublishStopRequestOnKafka(request) + except Exception as e: + LOGGER.error('Unable to delete collector. Error: {:}'.format(e)) return Empty() def PublishStopRequestOnKafka(self, collector_id): -- GitLab