Bump up patch version 2.0.4

[pti/o2.git] / o2app / bootstrap.py

diff --git a/o2app/bootstrap.py b/o2app/bootstrap.py
index 4413e80..7679ef3 100644 (file)
--- a/o2app/bootstrap.py
+++ b/o2app/bootstrap.py
@@ -17,7 +17,7 @@ import inspect
 from typing import Callable
 
 from o2common.adapter.notifications import AbstractNotifications,\
-    SmoO2Notifications
+    NoneNotifications
 from o2common.adapter import redis_eventpublisher
 from o2common.service import unit_of_work
 from o2common.service import messagebus
@@ -28,6 +28,7 @@ from o2app.adapter.unit_of_work import SqlAlchemyUnitOfWork
 from o2ims.adapter import orm as o2ims_orm
 from o2dms.adapter import orm as o2dms_orm
 
+
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -40,15 +41,6 @@ def wait_for_db_ready(engine):
     logger.info("DB is ready")
 
 
-@retry(tries=3, delay=2)
-def wait_for_mappers_ready(engine):
-    # wait for mapper ready
-    logger.info("Wait for mapper ready ...")
-    o2ims_orm.start_o2ims_mappers(engine)
-    o2dms_orm.start_o2dms_mappers(engine)
-    logger.info("mapper is ready")
-
-
 def bootstrap(
     start_orm: bool = True,
     uow: unit_of_work.AbstractUnitOfWork = SqlAlchemyUnitOfWork(),
@@ -57,7 +49,7 @@ def bootstrap(
 ) -> messagebus.MessageBus:
 
     if notifications is None:
-        notifications = SmoO2Notifications()
+        notifications = NoneNotifications()
 
     if start_orm:
         with uow:
@@ -65,7 +57,8 @@ def bootstrap(
             engine = uow.session.get_bind()
 
             wait_for_db_ready(engine)
-            wait_for_mappers_ready(engine)
+            o2ims_orm.start_o2ims_mappers(engine)
+            o2dms_orm.start_o2dms_mappers(engine)
 
     dependencies = {"uow": uow, "notifications": notifications,
                     "publish": publish}