Merge branch 'master' into lxc_devel

diff --git a/nodemanager.py b/nodemanager.py
index 8b2c6f6..cdd5e45 100755 (executable)
--- 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):

diff --git a/setup.py b/setup.py
index 082e565..98ec085 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ setup(
         'coresched',
         'curlwrapper',
         'database',
+        'initscript',
         'iptables',
         'logger',
         'net',

diff --git a/slivermanager.py b/slivermanager.py
index 606f4f3..4caa1ad 100644 (file)
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -68,7 +68,8 @@ def adjustReservedSlivers (data):
     if 'reservation_policy' not in data: return
     policy=data['reservation_policy'] 
     if policy not in ['lease_or_idle', 'lease_or_shared']:
-        logger.log ("unexpected reservation_policy %(policy)s"%locals())
+        if policy is not None:
+            logger.log ("unexpected reservation_policy %(policy)s"%locals())
         return
 
     logger.log("slivermanager.adjustReservedSlivers")