X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=ca3de00f16260285ed5b6001e5be7589caea9cab;hb=2d0960bbe7d42aef305300c4905720fa30f85534;hp=69f41dd39c661f87a52fd7cbba557a77a848c0d1;hpb=50eb660aa10575580f8f93c1f36c63ec3a9841b7;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 69f41dd..ca3de00 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -158,7 +158,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): else: os.waitpid(child_pid, 0) self.initscriptchanged = False - else: logger.log_exc('sliver_vs: not starting, is not enabled', name=self.name) + else: logger.log('sliver_vs: not starting %s, is not enabled'%self.name) def stop(self): logger.log('sliver_vs: %s: stopping' % self.name) @@ -238,11 +238,18 @@ class Sliver_VS(accounts.Account, vserver.VServer): (self.name, self.rspec['ip_addresses'])) self.set_ipaddresses_config(self.rspec['ip_addresses']) - if self.is_running(): - logger.log("sliver_vs: %s: Setting name to %s" % (self.name, 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)) - file('/etc/vservers/%s/slice_id' % self.name, 'w').write("%d"%self.slice_id) + logger.log("sliver_vs: %s: Setting name to %s" % (self.name, 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)) + try: + vserver_config_path = '/etc/vservers/%s'%self.name + if not os.path.exists (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: + logger.log("sliver_vs: Could not record slice_id for slice %s. Error: %s"%(self.name,str(e))) + if self.enabled == False: self.enabled = True