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

src/monitoring/.gitlab-ci.yml

+1 −8
Original line number Diff line number Diff line
@@ -60,20 +60,13 @@ unit_test monitoring: 
    - sleep 30

    - docker ps -a

    - docker logs $IMAGE_NAME

    - echo "checkpoint-1"

    - 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 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 report --include='${IMAGE_NAME}/*' --show-missing"

    - echo "checkpoint-3"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:

    - echo "checkpoint-4"

    - docker rm -f $IMAGE_NAME

    - echo "checkpoint-5"

    - docker rm -f  questdb

    - echo "checkpoint-6"

    - docker network rm teraflowbridge

    - echo "checkpoint-7"

  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 == "push" && $CI_COMMIT_BRANCH == "develop"'

src/monitoring/service/EventTools.py

+0 −10
Original line number Diff line number Diff line
@@ -42,15 +42,12 @@ class EventsDeviceCollector: 
            return False



    def _collect(self, events_stream):

        LOGGER.warning('[_collect] begin')

        try:

            for event in events_stream:

                self._events_queue.put_nowait(event)

        except grpc.RpcError as e:

            if e.code() != grpc.StatusCode.CANCELLED: # pylint: disable=no-member

                LOGGER.warning('[_collect] raise')

                raise # pragma: no cover

        LOGGER.warning('[_collect] end')



    def start(self):

        try:
@@ -62,23 +59,17 @@ class EventsDeviceCollector: 
        return self._events_queue.get(block=block, timeout=timeout)



    def stop(self):

        LOGGER.warning('[stop] begin')

        self._device_stream.cancel()

        LOGGER.warning('[stop] joining')

        self._device_thread.join()

        LOGGER.warning('[stop] end')



    def listen_events(self):

        LOGGER.warning('[listen_events] begin')

        try:

            kpi_id_list = []



            while True:

                # LOGGER.info('getting Kpi by KpiID')

                try:

                    LOGGER.warning('[listen_events] waiting event')

                    event = self.get_event(block=True, timeout=0.5)

                    LOGGER.warning('[listen_events] event received')



                    if event.event.event_type == EventTypeEnum.EVENTTYPE_CREATE:

                        device = self._context_client.GetDevice(event.device_id)
@@ -100,7 +91,6 @@ class EventsDeviceCollector: 
                except queue.Empty:

                    break



            LOGGER.warning('[listen_events] return')

            return kpi_id_list

        except ServiceException as e:

            LOGGER.exception('ListenEvents exception')