Fix for bug 1433 additional checks for kafka readiness

[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 6698339..23d7a7c 100644 (file)
--- a/osm_mon/cmd/mon_server.py
+++ b/osm_mon/cmd/mon_server.py
@@ -27,13 +27,13 @@ import logging
 import sys
 
 from osm_mon.core.config import Config
-from osm_mon.core.database import DatabaseManager
 from osm_mon.server.server import Server
+from osm_mon.cmd.mon_utils import wait_till_core_services_are_ready
 
 
 def main():
-    parser = argparse.ArgumentParser(prog='osm-policy-agent')
-    parser.add_argument('--config-file', nargs='?', help='POL configuration file')
+    parser = argparse.ArgumentParser(prog='osm-mon-server')
+    parser.add_argument('--config-file', nargs='?', help='MON configuration file')
     args = parser.parse_args()
     cfg = Config(args.config_file)
 
@@ -46,15 +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...")
-    db_manager = DatabaseManager(cfg)
-    db_manager.create_tables()
-    log.info("Database initialized correctly.")
-    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.debug("Exception: %s", str(e))
+    else:
+        log.error("Failed to start MON Server")
 
 
 if __name__ == '__main__':