Fix for bug 1433 - MON will not start till MongoDB service is up

[osm/MON.git] / osm_mon / cmd / mon_server.py

diff --git a/osm_mon/cmd/mon_server.py b/osm_mon/cmd/mon_server.py
index e05f4b8..c296c0d 100644 (file)
--- a/osm_mon/cmd/mon_server.py
+++ b/osm_mon/cmd/mon_server.py
@@ -28,6 +28,7 @@ import sys
 
 from osm_mon.core.config import Config
 from osm_mon.server.server import Server
+from osm_mon.cmd.common_functions import wait_till_core_services_are_ready
 
 
 def main():
@@ -45,12 +46,15 @@ def main():
     root.addHandler(ch)
 
     log = logging.getLogger(__name__)
-    log.info("Starting MON Server...")
-    log.debug("Config: %s", cfg.conf)
-    log.info("Initializing database...")
-    loop = asyncio.get_event_loop()
-    server = Server(cfg, loop)
-    server.run()
+    if wait_till_core_services_are_ready(cfg, "osm-mon-server"):
+        log.info("Starting MON Server...")
+        log.debug("Config: %s", cfg.conf)
+        log.info("Initializing database...")
+        loop = asyncio.get_event_loop()
+        server = Server(cfg, loop)
+        server.run()
+    else:
+        log.error("Failed to start MON Server")
 
 
 if __name__ == '__main__':