X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcmd%2Fmon_server.py;h=e5bca31d7383d8ee2510c0907ab11a88ea3cf146;hb=3c4858e0f3e3ef1bcc3ac51fd95fb6f9c0227389;hp=e05f4b8c5f3485c031e814aa21dafba83d795e66;hpb=0085a4a8870a73a9186b0a2305ba00bae44a6ea0;p=osm%2FMON.git

diff --git a/osm_mon/cmd/mon_server.py b/osm_mon/cmd/mon_server.py
index e05f4b8..e5bca31 100644
--- 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.mon_utils import wait_till_core_services_are_ready
 
 
 def main():
@@ -45,12 +46,19 @@ 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()
+        try:
+            server = Server(cfg, loop)
+            server.run()
+        except Exception as e:
+            log.error("Failed to start MON Server")
+            log.exception("Exception: %s", str(e))
+    else:
+        log.error("Failed to start MON Server")
 
 
 if __name__ == '__main__':