renamed files used at runtime (see post-install script in specfile)

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 7236cc8..30ee0b7 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -86,7 +86,7 @@ def GetSlivers(config, plc):
         data = {}
     #  Invoke GetSlivers() functions from the callback modules
     for module in modules:
-#        logger.log('trigerring GetSlivers callback for module %s'%module.__name__)
+        logger.verbose('trigerring GetSlivers callback for module %s'%module.__name__)
         try:        
             callback = getattr(module, 'GetSlivers')
             callback(data, config, plc)
@@ -170,8 +170,8 @@ def run():
             return getattr(m1,'priority',default_priority) - getattr(m2,'priority',default_priority)
         modules.sort(sort_module_priority)
 
-        logger.verbose('modules priorities and order:')
-        for module in modules: logger.verbose ('%s: %s'%(getattr(module,'priority',default_priority),module.__name__))
+        logger.log('ordered modules:')
+        for module in modules: logger.log ('%s: %s'%(getattr(module,'priority',default_priority),module.__name__))
 
         # Load /etc/planetlab/session
         if os.path.exists(options.session):
@@ -188,20 +188,22 @@ def run():
         logger.log("nm: Checking Auth.")
         while plc.check_authentication() != True:
             try:
+#                import pdb
+#               pdb.set_trace()
                 plc.update_session()
                 logger.log("nm: Authentication Failure. Retrying")
-            except:
-                logger.log("nm: Retry Failed. Waiting")
+            except Exception,e:
+                logger.log("nm: Retry Failed. (%r); Waiting.."%e)
             time.sleep(iperiod)
         logger.log("nm: Authentication Succeeded!")
 
 
         while True:
         # Main NM Loop
-            logger.verbose('nm: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom))
+            logger.log('nm: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom))
             GetSlivers(config, plc)
             delay=iperiod + random.randrange(0,irandom)
-            logger.verbose('nm: mainloop - sleeping for %d s'%delay)
+            logger.log('nm: mainloop - sleeping for %d s'%delay)
             time.sleep(delay)
     except: logger.log_exc("nm: failed in run")