X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fserver%2Fserver.py;h=6df6ed036c456bf6b0defdf261c927947ffdec50;hb=refs%2Ftags%2Fv10.0.2;hp=07fdd225a17aeb145a71cb5b48c671c3289a81de;hpb=088fbd3cc60029c62ae83a44f39f907890f832c7;p=osm%2FMON.git

diff --git a/osm_mon/server/server.py b/osm_mon/server/server.py
index 07fdd22..6df6ed0 100755
--- a/osm_mon/server/server.py
+++ b/osm_mon/server/server.py
@@ -26,6 +26,7 @@ MON component in charge of CRUD operations for vim_accounts and alarms. It uses
 import asyncio
 import json
 import logging
+import time
 
 from osm_mon.core.config import Config
 from osm_mon.core.message_bus_client import MessageBusClient
@@ -48,14 +49,19 @@ class Server:
     def run(self):
         self.loop.run_until_complete(self.start())
 
-    async def start(self):
+    async def start(self, wait_time=5):
         topics = ["alarm_request"]
-        try:
-            await self.msg_bus.aioread(topics, self._process_msg)
-        except Exception as e:
-            # Failed to subscribe to kafka topic
-            log.exception("Error when subscribing to topics %s", str(topics))
-            raise e
+        while True:
+            try:
+                await self.msg_bus.aioread(topics, self._process_msg)
+                break
+            except Exception as e:
+                # Failed to subscribe to kafka topic
+                log.exception("Error when subscribing to topics %s", str(topics))
+                log.exception("Exception %s", str(e))
+                # Wait for some time for kaka to stabilize and then reattempt to subscribe again
+                time.sleep(wait_time)
+                log.info("Retrying to subscribe the kafka topic(s) %s", str(topics))
 
     async def _process_msg(self, topic, key, values):
         log.info("Message arrived: %s", values)
@@ -74,6 +80,7 @@ class Server:
                             alarm_details["severity"].lower(),
                             alarm_details["statistic"].lower(),
                             alarm_details["metric_name"],
+                            alarm_details["action"],
                             alarm_details["tags"],
                         )
                         response = response_builder.generate_response(