Removed process pool from MON evaluator

[osm/MON.git] / osm_mon / evaluator / evaluator.py

diff --git a/osm_mon/evaluator/evaluator.py b/osm_mon/evaluator/evaluator.py
index cc9a8ad..0b4efde 100644 (file)
--- a/osm_mon/evaluator/evaluator.py
+++ b/osm_mon/evaluator/evaluator.py
@@ -25,8 +25,6 @@ import logging
 import multiprocessing
 import time
 
-import peewee
-
 from osm_mon.core.config import Config
 from osm_mon.core.message_bus_client import MessageBusClient
 from osm_mon.core.models import Alarm
@@ -52,14 +50,12 @@ class Evaluator:
             try:
                 self.evaluate()
                 time.sleep(int(self.conf.get('evaluator', 'interval')))
-            except peewee.PeeweeException:
-                log.exception("Database error evaluating alarms: ")
-                raise
             except Exception:
                 log.exception("Error evaluating alarms")
 
     def evaluate(self):
         log.debug('evaluate')
+        log.info('Starting alarm evaluation')
         alarms_tuples = self.service.evaluate_alarms()
         processes = []
         for alarm, status in alarms_tuples:
@@ -69,18 +65,20 @@ class Evaluator:
             processes.append(p)
         for process in processes:
             process.join(timeout=10)
+        log.info('Alarm evaluation is complete')
 
     def notify_alarm(self, alarm: Alarm, status: AlarmStatus):
-        log.debug("notify_alarm")
+        log.debug("_notify_alarm")
         resp_message = self._build_alarm_response(alarm, status)
         log.info("Sent alarm notification: %s", resp_message)
         self.loop.run_until_complete(self.msg_bus.aiowrite('alarm_response', 'notify_alarm', resp_message))
 
     def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus):
+        log.debug("_build_alarm_response")
         response = ResponseBuilder()
         tags = {}
-        for tag in alarm.tags:
-            tags[tag.name] = tag.value
+        for name, value in alarm.tags.items():
+            tags[name] = value
         now = time.strftime("%d-%m-%Y") + " " + time.strftime("%X")
         return response.generate_response(
             'notify_alarm',