X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcmd%2Fmon_collector.py;h=d0330d42373d9f5917e684e9c6bf4987c8e5ffd4;hb=b170aec221ad296cc9de06a7b6069c878211cc65;hp=94c38830c8e4fe5098950e64d24248d0da6dca62;hpb=b6233b3d90ca1ba617e476b915fba056cf7891f7;p=osm%2FMON.git

diff --git a/osm_mon/cmd/mon_collector.py b/osm_mon/cmd/mon_collector.py
index 94c3883..d0330d4 100644
--- a/osm_mon/cmd/mon_collector.py
+++ b/osm_mon/cmd/mon_collector.py
@@ -27,6 +27,7 @@ import sys
 
 from osm_mon.collector.collector import Collector
 from osm_mon.core.config import Config
+from osm_mon.cmd.mon_utils import wait_till_core_services_are_ready
 
 
 def main():
@@ -44,11 +45,18 @@ def main():
     root.addHandler(ch)
 
     log = logging.getLogger(__name__)
-    log.info("Starting MON Collector...")
-    log.debug("Config: %s", cfg.conf)
-    log.info("Initializing database...")
-    collector = Collector(cfg)
-    collector.collect_forever()
+    if wait_till_core_services_are_ready(cfg, "osm-mon-collector"):
+        log.info("Starting MON Collector...")
+        log.debug("Config: %s", cfg.conf)
+        log.info("Initializing database...")
+        try:
+            collector = Collector(cfg)
+            collector.collect_forever()
+        except Exception as e:
+            log.error("Failed to start MON Collector")
+            log.debug("Exception: %s", str(e))
+    else:
+        log.error("Failed to start MON Collector")
 
 
 if __name__ == '__main__':