X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=a2b6a4d260cd1926eb469370b85dfa3307aa3293;hb=9290e5eebd36ce2d8a4bf276202903883bb68297;hp=3eaec87299d53daaf798dcee79da5e3a1de83c64;hpb=64d4adb26fce692ae87047632689abbf2ff9e128;p=nodemanager.git

diff --git a/nm.py b/nm.py
old mode 100644
new mode 100755
index 3eaec87..a2b6a4d
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-# Something relevant
 """Node Manager"""
 
 import optparse
@@ -18,8 +17,11 @@ from plcapi import PLCAPI
 import random
 import net
 
+id="$Id$"
 savedargv = sys.argv[:]
 
+known_modules=['conf_files', 'sm', 'bwmon', 'vsys', 'codemux']
+
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
 parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
@@ -28,13 +30,19 @@ parser.add_option('-k', '--session', action='store', dest='session', default='/e
 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')
+parser.add_option('-m', '--module', action='store', dest='module', default='', help='run a single module among '+' '.join(known_modules))
 (options, args) = parser.parse_args()
 
 modules = []
 
 def GetSlivers(plc):
-    try: data = plc.GetSlivers()
-    except: logger.log_exc()
+    try: 
+        logger.log("Syncing w/ PLC")
+        data = plc.GetSlivers()
+    except: 
+        logger.log_exc()
+        #  XXX So some modules can at least boostrap.
+        data = {}
     if (options.verbose):
         logger.log_slivers(data)
     # Set i2 ip list for nodes in I2 nodegroup.
@@ -67,7 +75,13 @@ def run():
             print "Warning while writing PID file:", err
 
         # Load and start modules
-        for module in ['proper', 'conf_files', 'sm', 'bwmon']:
+        if options.module:
+            assert options.module in known_modules
+            running_modules=[options.module]
+            logger.verbose('Running single module %s'%options.module)
+        else:
+            running_modules=known_modules
+        for module in running_modules:
             try:
                 m = __import__(module)
                 m.start(options, config)
@@ -97,7 +111,7 @@ def run():
 
 
 if __name__ == '__main__':
-    logger.verbose("Entering nm.py")
+    logger.log("Entering nm.py "+id)
     stacklim = 512*1024  # 0.5 MiB
     curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
     if curlim > stacklim: