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:
2d0960b
)
Tweaks
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Wed, 28 Apr 2010 15:09:36 +0000
(15:09 +0000)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Wed, 28 Apr 2010 15:09:36 +0000
(15:09 +0000)
sliver_vs.py
patch
|
blob
|
history
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
ca3de00
..
f6c207e
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-238,9
+238,9
@@
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'])
- logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id))
+
#
logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id))
#self.setname(self.slice_id)
#self.setname(self.slice_id)
- logger.log("sliver_vs: %s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id))
+
#
logger.log("sliver_vs: %s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id))
try:
vserver_config_path = '/etc/vservers/%s'%self.name
if not os.path.exists (vserver_config_path):
try:
vserver_config_path = '/etc/vservers/%s'%self.name
if not os.path.exists (vserver_config_path):
@@
-249,6
+249,8
@@
class Sliver_VS(accounts.Account, vserver.VServer):
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: 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)))
+ except Exception,e:
+ logger.log_exc("sliver_vs: Error recording slice id: %s"%str(e),name=self.name)
if self.enabled == False:
if self.enabled == False: