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

Monitoring component:

- removed checkpoints in CI/CD pipeline
- removed log messages in classes
parent 7860c44c
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!43CI pipeline and multiple module fixes
...@@ -60,20 +60,13 @@ unit_test monitoring: ...@@ -60,20 +60,13 @@ unit_test monitoring:
- sleep 30 - sleep 30
- docker ps -a - docker ps -a
- docker logs $IMAGE_NAME - docker logs $IMAGE_NAME
- echo "checkpoint-1" - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
- docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO -o log_cli=true --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
- echo "checkpoint-2"
- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing" - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
- echo "checkpoint-3"
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/' coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script: after_script:
- echo "checkpoint-4"
- docker rm -f $IMAGE_NAME - docker rm -f $IMAGE_NAME
- echo "checkpoint-5"
- docker rm -f questdb - docker rm -f questdb
- echo "checkpoint-6"
- docker network rm teraflowbridge - docker network rm teraflowbridge
- echo "checkpoint-7"
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"' - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'
......
...@@ -42,15 +42,12 @@ class EventsDeviceCollector: ...@@ -42,15 +42,12 @@ class EventsDeviceCollector:
return False return False
def _collect(self, events_stream): def _collect(self, events_stream):
LOGGER.warning('[_collect] begin')
try: try:
for event in events_stream: for event in events_stream:
self._events_queue.put_nowait(event) self._events_queue.put_nowait(event)
except grpc.RpcError as e: except grpc.RpcError as e:
if e.code() != grpc.StatusCode.CANCELLED: # pylint: disable=no-member if e.code() != grpc.StatusCode.CANCELLED: # pylint: disable=no-member
LOGGER.warning('[_collect] raise')
raise # pragma: no cover raise # pragma: no cover
LOGGER.warning('[_collect] end')
def start(self): def start(self):
try: try:
...@@ -62,23 +59,17 @@ class EventsDeviceCollector: ...@@ -62,23 +59,17 @@ class EventsDeviceCollector:
return self._events_queue.get(block=block, timeout=timeout) return self._events_queue.get(block=block, timeout=timeout)
def stop(self): def stop(self):
LOGGER.warning('[stop] begin')
self._device_stream.cancel() self._device_stream.cancel()
LOGGER.warning('[stop] joining')
self._device_thread.join() self._device_thread.join()
LOGGER.warning('[stop] end')
def listen_events(self): def listen_events(self):
LOGGER.warning('[listen_events] begin')
try: try:
kpi_id_list = [] kpi_id_list = []
while True: while True:
# LOGGER.info('getting Kpi by KpiID') # LOGGER.info('getting Kpi by KpiID')
try: try:
LOGGER.warning('[listen_events] waiting event')
event = self.get_event(block=True, timeout=0.5) event = self.get_event(block=True, timeout=0.5)
LOGGER.warning('[listen_events] event received')
if event.event.event_type == EventTypeEnum.EVENTTYPE_CREATE: if event.event.event_type == EventTypeEnum.EVENTTYPE_CREATE:
device = self._context_client.GetDevice(event.device_id) device = self._context_client.GetDevice(event.device_id)
...@@ -100,7 +91,6 @@ class EventsDeviceCollector: ...@@ -100,7 +91,6 @@ class EventsDeviceCollector:
except queue.Empty: except queue.Empty:
break break
LOGGER.warning('[listen_events] return')
return kpi_id_list return kpi_id_list
except ServiceException as e: except ServiceException as e:
LOGGER.exception('ListenEvents exception') LOGGER.exception('ListenEvents exception')
......
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