git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2a50ec5
)
Added ReCreate. Also added try catch to api eval of rpc method.
1.5
1.5
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Wed, 21 Nov 2007 14:41:17 +0000
(14:41 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Wed, 21 Nov 2007 14:41:17 +0000
(14:41 +0000)
sliver_vs.py
patch
|
blob
|
history
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
5ed8f8f
..
bed3e62
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-50,7
+50,7
@@
class Sliver_VS(accounts.Account, vserver.VServer):
except Exception, err:
if not isinstance(err, vserver.NoSuchVServer):
# Probably a bad vserver or vserver configuration file
except Exception, err:
if not isinstance(err, vserver.NoSuchVServer):
# Probably a bad vserver or vserver configuration file
- logger.log_exc()
+ logger.log_exc(
rec['name']
)
logger.log('%s: recreating bad vserver' % rec['name'])
self.destroy(rec['name'])
self.create(rec['name'], rec['vref'])
logger.log('%s: recreating bad vserver' % rec['name'])
self.destroy(rec['name'])
self.create(rec['name'], rec['vref'])
@@
-92,7
+92,7
@@
class Sliver_VS(accounts.Account, vserver.VServer):
try:
self.chroot_call(install_initscript)
self.initscriptchanged = True
try:
self.chroot_call(install_initscript)
self.initscriptchanged = True
- except: logger.log_exc()
+ except: logger.log_exc(
self.name
)
accounts.Account.configure(self, rec) # install ssh keys
accounts.Account.configure(self, rec) # install ssh keys
@@
-127,9
+127,9
@@
class Sliver_VS(accounts.Account, vserver.VServer):
logger.log('%s: computing disk usage: ended' % self.name)
self.disk_usage_initialized = True
vserver.VServer.set_disklimit(self, max(disk_max, self.disk_blocks))
logger.log('%s: computing disk usage: ended' % self.name)
self.disk_usage_initialized = True
vserver.VServer.set_disklimit(self, max(disk_max, self.disk_blocks))
- except
OSError
:
+ except:
logger.log('%s: failed to set max disk usage' % self.name)
logger.log('%s: failed to set max disk usage' % self.name)
- logger.log_exc()
+ logger.log_exc(
self.name
)
# get/set the min/soft/hard values for all of the vserver
# related RLIMITS. Note that vserver currently only
# get/set the min/soft/hard values for all of the vserver
# related RLIMITS. Note that vserver currently only