* BWmon is now event driven and handles reboots. Also got rid of ALL legacy code.

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 562a52d..243a782 100644 (file)
--- a/nm.py
+++ b/nm.py
@@ -15,7 +15,7 @@ import tools
 
 from config import Config
 from plcapi import PLCAPI 
-
+import random
 
 savedargv = sys.argv[:]
 
@@ -24,7 +24,7 @@ parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=
 parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
 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=900, help='Polling interval (sec)')
+parser.add_option('-p', '--period', action='store', dest='period', default=600, help='Polling interval (sec)')
 (options, args) = parser.parse_args()
 
 modules = []
@@ -55,7 +55,7 @@ def run():
             print "Warning while writing PID file:", err
 
         # Load and start modules
-        for module in ['net', 'proper', 'conf_files', 'sm']:
+        for module in ['net', 'proper', 'conf_files', 'sm', 'bwmon']:
             try:
                 m = __import__(module)
                 m.start(options, config)
@@ -75,7 +75,7 @@ def run():
         while True:
             try: GetSlivers(plc)
             except: logger.log_exc()
-            time.sleep(options.period)
+            time.sleep(options.period + random.randrange(0,301))
     except: logger.log_exc()