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 79adabd..cc36d99 100644 (file)
--- a/osm_mon/cmd/mon_evaluator.py
+++ b/osm_mon/cmd/mon_evaluator.py
@@ -21,37 +21,42 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
+import argparse
 import logging
 import sys
 
-from osm_mon.core.database import DatabaseManager
-from osm_mon.core.settings import Config
+from osm_mon.core.config import Config
 from osm_mon.evaluator.evaluator import Evaluator
+from osm_mon.cmd.mon_utils import wait_till_core_services_are_ready
 
 
 def main():
-    cfg = Config.instance()
+    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)
 
     root = logging.getLogger()
-    root.setLevel(logging.getLevelName(cfg.OSMMON_LOG_LEVEL))
+    root.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
     ch = logging.StreamHandler(sys.stdout)
-    ch.setLevel(logging.getLevelName(cfg.OSMMON_LOG_LEVEL))
+    ch.setLevel(logging.getLevelName(cfg.get('global', 'loglevel')))
     formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s', '%m/%d/%Y %I:%M:%S %p')
     ch.setFormatter(formatter)
     root.addHandler(ch)
 
-    kafka_logger = logging.getLogger('kafka')
-    kafka_logger.setLevel(logging.getLevelName(cfg.OSMMON_KAFKA_LOG_LEVEL))
-
     log = logging.getLogger(__name__)
-    log.info("Starting MON Evaluator...")
-    log.debug("Config: %s", vars(cfg))
-    log.info("Initializing database...")
-    db_manager = DatabaseManager()
-    db_manager.create_tables()
-    log.info("Database initialized correctly.")
-    evaluator = Evaluator()
-    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__':