renamed files used at runtime (see post-install script in specfile)

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index f6c207e..878579d 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -57,7 +57,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         logger.verbose ('sliver_vs: %s init'%name)
         try:
             logger.log("sliver_vs: %s: first chance..."%name)
-            vserver.VServer.__init__(self, name,logfile='/var/log/nm')
+            vserver.VServer.__init__(self, name,logfile='/var/log/nodemanager')
         except Exception, err:
             if not isinstance(err, vserver.NoSuchVServer):
                 # Probably a bad vserver or vserver configuration file
@@ -66,7 +66,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                 self.destroy(name)
             self.create(name, rec['vref'])
             logger.log("sliver_vs: %s: second chance..."%name)
-            vserver.VServer.__init__(self, name,logfile='/var/log/nm')
+            vserver.VServer.__init__(self, name,logfile='/var/log/nodemanager')
 
         self.keys = ''
         self.rspec = {}
@@ -245,7 +245,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                 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)
+                file('%s/slice_id'%vserver_config_path, 'w').write("%d\n"%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)))