X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;fp=nm.py;h=a7f1f700357073a9360992e70dc872036e88e848;hb=d35c054351adbd113ae72b73ce2d2a485f901a32;hp=f9517656d59250f4e48c6947ffd498a5c406cdcc;hpb=b9c6ed830b93dfe2ce82886bf8057fcd14decb8c;p=nodemanager.git

diff --git a/nm.py b/nm.py
index f951765..a7f1f70 100644
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+# $Id: $
+
 """Node Manager"""
 
 import optparse
@@ -32,9 +34,15 @@ modules = []
 
 def GetSlivers(plc):
     data = plc.GetSlivers()
+    # 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:
-        callback = getattr(module, 'GetSlivers')
-        callback(data)
+        try:        
+            callback = getattr(module, 'GetSlivers')
+            callback(data)
+        except: logger.log_exc()
 
 def run():
     try:
@@ -70,12 +78,8 @@ def run():
         plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
 
         while True:
-			# Set i2 ip list for nodes in I2 nodegroup.
-            try: net.GetSlivers(plc, data)
-            except: logger.log_exc()
-			# Main NM Loop
-            try: GetSlivers(plc)
-            except: logger.log_exc()
+        # Main NM Loop
+            GetSlivers(plc)
             time.sleep(options.period + random.randrange(0,301))
     except: logger.log_exc()