X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=3eaec87299d53daaf798dcee79da5e3a1de83c64;hb=2f100cd2a78a0f91022bc4a895007975181cf353;hp=f9517656d59250f4e48c6947ffd498a5c406cdcc;hpb=b455fb0b6e820f44b5d13daac7308f60fc9c5cd8;p=nodemanager.git

diff --git a/nm.py b/nm.py
index f951765..3eaec87 100644
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-
+# Something relevant
 """Node Manager"""
 
 import optparse
@@ -26,20 +26,35 @@ parser.add_option('-s', '--startup', action='store_true', dest='startup', defaul
 parser.add_option('-f', '--config', action='store', dest='config', default='/etc/planetlab/plc_config', help='PLC configuration file')
 parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session', help='API session key (or file)')
 parser.add_option('-p', '--period', action='store', dest='period', default=600, help='Polling interval (sec)')
+parser.add_option('-r', '--random', action='store', dest='random', default=301, help='Range for additional random polling interval (sec)')
+parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='more verbose log')
 (options, args) = parser.parse_args()
 
 modules = []
 
 def GetSlivers(plc):
-    data = plc.GetSlivers()
+    try: data = plc.GetSlivers()
+    except: logger.log_exc()
+    if (options.verbose):
+        logger.log_slivers(data)
+    # 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:
         if options.daemon: tools.daemon()
 
+        # set log level
+        if (options.verbose):
+            logger.set_level(logger.LOG_VERBOSE)
+
         # Load /etc/planetlab/plc_config
         config = Config(options.config)
 
@@ -67,20 +82,22 @@ def run():
             session = options.session
 
         # Initialize XML-RPC client
-        plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
+        iperiod=int(options.period)
+        irandom=int(options.random)
+        plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/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()
-            time.sleep(options.period + random.randrange(0,301))
+        # Main NM Loop
+            logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom))
+            GetSlivers(plc)
+            delay=iperiod + random.randrange(0,irandom)
+            logger.verbose('mainloop - sleeping for %d s'%delay)
+            time.sleep(delay)
     except: logger.log_exc()
 
 
 if __name__ == '__main__':
+    logger.verbose("Entering nm.py")
     stacklim = 512*1024  # 0.5 MiB
     curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
     if curlim > stacklim: