fix bug 823: make user-show backward compatible providing 'projects' with the list...

[osm/NBI.git] / osm_nbi / subscriptions.py

diff --git a/osm_nbi/subscriptions.py b/osm_nbi/subscriptions.py
index 7df78d2..156f466 100644 (file)
--- a/osm_nbi/subscriptions.py
+++ b/osm_nbi/subscriptions.py
@@ -57,12 +57,42 @@ class SubscriptionThread(threading.Thread):
         self.logger = logging.getLogger("nbi.subscriptions")
         self.aiomain_task = None  # asyncio task for receiving kafka bus
         self.internal_session = {  # used for a session to the engine methods
-            "_id": "subscription",
-            "id": "subscription",
-            "project_id": "admin",
-            "admin": True
+            "project_id": (),
+            "set_project": (),
+            "admin": True,
+            "force": False,
+            "public": None,
+            "method": "delete",
         }
 
+    async def start_kafka(self):
+        # timeout_wait_for_kafka = 3*60
+        kafka_working = True
+        while not self.to_terminate:
+            try:
+                # bug 710 635. The library aiokafka does not recieve anything when the topci at kafka has not been
+                # created.
+                # Before subscribe, send dummy messages
+                await self.msg.aiowrite("admin", "echo", "dummy message", loop=self.loop)
+                await self.msg.aiowrite("ns", "echo", "dummy message", loop=self.loop)
+                await self.msg.aiowrite("nsi", "echo", "dummy message", loop=self.loop)
+                if not kafka_working:
+                    self.logger.critical("kafka is working again")
+                    kafka_working = True
+                await asyncio.sleep(10, loop=self.loop)
+                self.aiomain_task = asyncio.ensure_future(self.msg.aioread(("ns", "nsi"), loop=self.loop,
+                                                                           callback=self._msg_callback),
+                                                          loop=self.loop)
+                await asyncio.wait_for(self.aiomain_task, timeout=None, loop=self.loop)
+            except Exception as e:
+                if self.to_terminate:
+                    return
+                if kafka_working:
+                    # logging only first time
+                    self.logger.critical("Error accessing kafka '{}'. Retrying ...".format(e))
+                    kafka_working = False
+            await asyncio.sleep(10, loop=self.loop)
+
     def run(self):
         """
         Start of the thread
@@ -99,10 +129,8 @@ class SubscriptionThread(threading.Thread):
         self.logger.debug("Starting")
         while not self.to_terminate:
             try:
-                self.aiomain_task = asyncio.ensure_future(self.msg.aioread(("ns", "nsi"), loop=self.loop,
-                                                                           callback=self._msg_callback),
-                                                          loop=self.loop)
-                self.loop.run_until_complete(self.aiomain_task)
+
+                self.loop.run_until_complete(asyncio.ensure_future(self.start_kafka(), loop=self.loop))
             # except asyncio.CancelledError:
             #     break  # if cancelled it should end, breaking loop
             except Exception as e:
@@ -162,4 +190,5 @@ class SubscriptionThread(threading.Thread):
         :return: None
         """
         self.to_terminate = True
-        self.loop.call_soon_threadsafe(self.aiomain_task.cancel)
+        if self.aiomain_task:
+            self.loop.call_soon_threadsafe(self.aiomain_task.cancel)