X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=370c8df885e7cc83705c9c529c988385412e7c36;hb=0c25694725cfc416cacf435e83541629d4f7c911;hp=c7beebf24b7ef86d80189af9f73bbb64b5fdbca1;hpb=78431edeac05e3ab1ca8022514f24b173da5286a;p=nodemanager.git

diff --git a/nm.py b/nm.py
index c7beebf..370c8df 100644
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-
+# Something relevant
 """Node Manager"""
 
 import optparse
@@ -15,7 +15,8 @@ import tools
 
 from config import Config
 from plcapi import PLCAPI 
-
+import random
+import net
 
 savedargv = sys.argv[:]
 
@@ -30,14 +31,17 @@ parser.add_option('-p', '--period', action='store', dest='period', default=600,
 modules = []
 
 def GetSlivers(plc):
-    data = plc.GetSlivers()
-    # net needs access to API for i2 nodes.
+    try: data = plc.GetSlivers()
+    except: logger.log_exc()
+    # Set i2 ip list for nodes in I2 nodegroup.
+    try: net.GetSlivers(plc, data)
+    except: logger.log_exc()
+    #  All other callback modules
     for module in modules:
-        if module.__name__ == 'net':
-            module.GetSlivers(plc, data)
-        else:
+        try:        
             callback = getattr(module, 'GetSlivers')
             callback(data)
+        except: logger.log_exc()
 
 def run():
     try:
@@ -55,7 +59,7 @@ def run():
             print "Warning while writing PID file:", err
 
         # Load and start modules
-        for module in ['net', 'proper', 'conf_files', 'sm']:
+        for module in ['proper', 'conf_files', 'sm', 'bwmon']:
             try:
                 m = __import__(module)
                 m.start(options, config)
@@ -73,9 +77,9 @@ def run():
         plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
 
         while True:
-            try: GetSlivers(plc)
-            except: logger.log_exc()
-            time.sleep(options.period)
+        # Main NM Loop
+            GetSlivers(plc)
+            time.sleep(options.period + random.randrange(0,301))
     except: logger.log_exc()