From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 7 Feb 2007 04:21:52 +0000 (+0000)
Subject: try and recreate bad vservers
X-Git-Tag: NodeManager-1.6-1~158
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8a55b662a2f9e938ae93c9b8864f0971b3db3bbb;p=nodemanager.git

try and recreate bad vservers
---

diff --git a/sliver_vs.py b/sliver_vs.py
index 29ab5ba..e4c438c 100644
--- 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'])