X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager.py;h=0d3009d7e8d4ea7c0f2ef8eba933830ab11b1ad7;hb=e57432c1dfdfeaa52cc32799e2abbc34b7704ce9;hp=cdd5e4547a46000702f5b91c62a8e00fcbeb9045;hpb=270c9eeb6f1247fa3e46d68e71a2353ce6cc1546;p=nodemanager.git

diff --git a/nodemanager.py b/nodemanager.py
index cdd5e45..0d3009d 100755
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -74,7 +74,10 @@ class NodeManager:
         # Deal with plugins directory
         if os.path.exists(self.options.path):
             sys.path.append(self.options.path)
-            plugins = [ os.path.split(os.path.splitext(x)[0])[1] for x in glob.glob( os.path.join(self.options.path,'*.py') ) ]
+            plugins = [ os.path.split(os.path.splitext(x)[0])[1]
+                        for x in glob.glob( os.path.join(self.options.path,'*.py') )
+                        if not x.endswith("/__init__.py")
+                        ]
             self.modules += plugins
         if self.options.user_module:
             assert self.options.user_module in self.modules
@@ -114,6 +117,8 @@ class NodeManager:
                 if getattr(module,'persistent_data',False):
                     module_data=last_data
                 callback(data, config, plc)
+            except SystemExit as e:
+                sys.exit(e)
             except:
                 logger.log_exc("nodemanager: GetSlivers failed to run callback for module %r"%module)
 
@@ -171,12 +176,16 @@ class NodeManager:
             return {}
 
     def run(self):
+        # make sure to create /etc/planetlab/virt so others can read that
+        # used e.g. in vsys-scripts's sliceip
+        tools.get_node_virt()
         try:
             if self.options.daemon: tools.daemon()
 
             # set log level
             if (self.options.verbose):
                 logger.set_level(logger.LOG_VERBOSE)
+            tools.init_signals()
 
             # Load /etc/planetlab/plc_config
             config = Config(self.options.config)
@@ -196,13 +205,15 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
                 try:
                     m = __import__(module)
                     logger.verbose("nodemanager: triggering %s.start"%m.__name__)
-                    m.start()
+                    try:        m.start()
+                    except:     logger.log("WARNING: module %s did not start")
                     self.loaded_modules.append(m)
-                except ImportError, 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)
+                except:
+                    if module not in NodeManager.core_modules:
+                        logger.log_exc ("ERROR while loading module %s - skipped" % module)
+                    else:
+                        logger.log("FATAL : failed to start core module %s"%module)
+                        sys.exit(1)
 
             # sort on priority (lower first)
             def sort_module_priority (m1,m2):
@@ -249,7 +260,10 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
                 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")
+        except SystemExit:
+            pass
+        except: 
+            logger.log_exc("nodemanager: failed in run")
 
 def run():
     logger.log("======================================== Entering nodemanager.py")