git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
it's actually on 1.8-28
[nodemanager.git]
/
sliver_vs.py
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
9615ca7
..
1322173
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-265,14
+265,16
@@
class Sliver_VS(accounts.Account, vserver.VServer):
(self.name, self.rspec['ip_addresses']))
self.set_ipaddresses_config(self.rspec['ip_addresses'])
(self.name, self.rspec['ip_addresses']))
self.set_ipaddresses_config(self.rspec['ip_addresses'])
- try:
+ try:
vserver_config_path = '/etc/vservers/%s'%self.name
if not os.path.exists (vserver_config_path):
vserver_config_path = '/etc/vservers/%s'%self.name
if not os.path.exists (vserver_config_path):
- os.makedirs (vserver_config_path)
+ os.makedirs (vserver_config_path)
file('%s/slice_id'%vserver_config_path, 'w').write("%d"%self.slice_id)
logger.log("sliver_vs: Recorded slice id %d for slice %s"%(self.slice_id,self.name))
except IOError,e:
file('%s/slice_id'%vserver_config_path, 'w').write("%d"%self.slice_id)
logger.log("sliver_vs: Recorded slice id %d for slice %s"%(self.slice_id,self.name))
except IOError,e:
- logger.log("sliver_vs: Could not record slice_id for slice %s. Error: %s"%(self.name,str(e)))
+ logger.log("sliver_vs: Could not record slice_id for slice %s. Error: %s"%(self.name,str(e)))
+ except Exception,e:
+ logger.log_exc("sliver_vs: Error recording slice id: %s"%str(e),name=self.name)
if self.enabled == False:
self.enabled = True
if self.enabled == False:
self.enabled = True