Fix for bug 1433 additional checks for kafka readiness

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

diff --git a/osm_mon/cmd/mon_evaluator.py b/osm_mon/cmd/mon_evaluator.py
index 3835d7e..cc36d99 100644 (file)
--- a/osm_mon/cmd/mon_evaluator.py
+++ b/osm_mon/cmd/mon_evaluator.py
@@ -26,13 +26,13 @@ import logging
 import sys
 
 from osm_mon.core.config import Config
-from osm_mon.core.database import DatabaseManager
 from osm_mon.evaluator.evaluator import Evaluator
+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-evaluator')
+    parser.add_argument('--config-file', nargs='?', help='MON configuration file')
     args = parser.parse_args()
     cfg = Config(args.config_file)
 
@@ -45,14 +45,18 @@ def main():
     root.addHandler(ch)
 
     log = logging.getLogger(__name__)
-    log.info("Starting MON Evaluator...")
-    log.debug("Config: %s", cfg.conf)
-    log.info("Initializing database...")
-    db_manager = DatabaseManager(cfg)
-    db_manager.create_tables()
-    log.info("Database initialized correctly.")
-    evaluator = Evaluator(cfg)
-    evaluator.evaluate_forever()
+    if wait_till_core_services_are_ready(cfg, "osm-mon-evaluator"):
+        log.info("Starting MON Evaluator...")
+        log.debug("Config: %s", cfg.conf)
+        log.info("Initializing database...")
+        try:
+            evaluator = Evaluator(cfg)
+            evaluator.evaluate_forever()
+        except Exception as e:
+            log.error("Failed to start MON Evaluator")
+            log.debug("Exception: %s", str(e))
+    else:
+        log.error("Failed to start MON Evaluator")
 
 
 if __name__ == '__main__':