merge changes from head

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index b757400..e4c438c 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -37,7 +37,12 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     def __init__(self, rec):
         try:
             vserver.VServer.__init__(self, rec['name'])
-        except vserver.NoSuchVServer:
+        except Exception, err:
+            if not isinstance(err, vserver.NoSuchVServer):
+                # Probably a bad vserver or vserver configuration file
+                logger.log_exc()
+                logger.log('%s: recreating bad vserver' % rec['name'])
+                self.destroy(rec['name'])
             self.create(rec['name'], rec['vref'])
             vserver.VServer.__init__(self, rec['name'])
 
@@ -111,7 +116,13 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             logger.log('%s: failed to set max disk usage' % self.name)
             logger.log_exc()
 
-        net_limits = (self.rspec['net_min_rate'], self.rspec['net_max_rate'], self.rspec['net_i2_min_rate'], self.rspec['net_i2_max_rate'], self.rspec['net_share'])
+        # N.B. net_*_rate are in kbps because of XML-RPC maxint
+        # limitations, convert to bps which is what bwlimit.py expects.
+        net_limits = (self.rspec['net_min_rate'] * 1000,
+                      self.rspec['net_max_rate'] * 1000,
+                      self.rspec['net_i2_min_rate'] * 1000,
+                      self.rspec['net_i2_max_rate'] * 1000,
+                      self.rspec['net_share'])
         logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
         logger.log('%s: setting net share to %d' % (self.name, net_limits[-1]))
         self.set_bwlimit(*net_limits)