temporary rename bwlimit as bwlimitlxc for a dry run of the

[nodemanager.git] / slivermanager.py

diff --git a/slivermanager.py b/slivermanager.py
index 606f4f3..ea446fc 100644 (file)
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -18,7 +18,7 @@ import account
 import controller
 import sliver_lxc
 
-try: from bwlimit import bwmin, bwmax
+try: from bwlimitlxc import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 
 priority=10
@@ -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")