X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager.py;h=cdd5e4547a46000702f5b91c62a8e00fcbeb9045;hb=ac8187d5ee8c4c5781ea16af038bdb2818607bfa;hp=68a8be40cd8d88846b7f157a86a01cf9eb9a68a4;hpb=1dfc88561e72e747a97769f246b2d322f9ec4d7c;p=nodemanager.git

diff --git a/nodemanager.py b/nodemanager.py
index 68a8be4..cdd5e45 100755
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -15,16 +15,16 @@ import xmlrpclib
 import socket
 import os
 import sys
-import resource
 import glob
 import pickle
+import random
+import resource
 
 import logger
 import tools
 
 from config import Config
 from plcapi import PLCAPI
-import random
 
 
 class NodeManager:
@@ -199,7 +199,10 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
                     m.start()
                     self.loaded_modules.append(m)
                 except ImportError, err:
-                    print "Warning while loading module %s:" % module, err
+                    logger.log_exc ("ERROR while loading module %s - skipping:" % module)
+                    # if we fail to load any of these, it's really no need to go on any further
+                    if module in NodeManager.core_modules:
+                        logger.log("FATAL : failed to load core module %s"%module)
 
             # sort on priority (lower first)
             def sort_module_priority (m1,m2):
@@ -238,10 +241,13 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
 
             while True:
             # Main nodemanager Loop
+                work_beg=time.time()
                 logger.log('nodemanager: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom))
                 self.GetSlivers(config, plc)
                 delay=iperiod + random.randrange(0,irandom)
-                logger.log('nodemanager: mainloop - sleeping for %d s'%delay)
+                work_end=time.time()
+                work_duration=int(work_end-work_beg)
+                logger.log('nodemanager: mainloop has worked for %s s - sleeping for %d s'%(work_duration,delay))
                 time.sleep(delay)
         except: logger.log_exc("nodemanager: failed in run")