fix logging of vserver class into /var/log/nm

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 49887e6..3e0067e 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -45,8 +45,9 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     _init_disk_info_sem = tools.NMLock("/var/run/nm-disk-info.lock")
 
     def __init__(self, rec):
+        logger.verbose ('initing Sliver_VS with name=%s'%rec['name'])
         try:
-            vserver.VServer.__init__(self, rec['name'])
+            vserver.VServer.__init__(self, rec['name'],logfile='/var/log/nm')
         except Exception, err:
             if not isinstance(err, vserver.NoSuchVServer):
                 # Probably a bad vserver or vserver configuration file
@@ -54,7 +55,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                 logger.log('%s: recreating bad vserver' % rec['name'])
                 self.destroy(rec['name'])
             self.create(rec['name'], rec['vref'])
-            vserver.VServer.__init__(self, rec['name'])
+            vserver.VServer.__init__(self, rec['name'],logfile='/var/log/nm')
 
         self.keys = ''
         self.rspec = {}
@@ -65,6 +66,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
 
     @staticmethod
     def create(name, vref = None):
+        logger.verbose('Sliver_VS:create - name=%s'%name)
         if vref is not None:
             logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
         else:
@@ -167,7 +169,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             else:
                 logger.log('%s: setting cpu share to %d' % (self.name, cpu_share))
                 self.set_sched_config(cpu_share, 0)
-
+            # if IP address isn't set (even to 0.0.0.0), sliver won't be able to use network
             if self.rspec['ip_addresses'] != '0.0.0.0':
                 logger.log('%s: setting IP address(es) to %s' % (self.name, self.rspec['ip_addresses']))
             self.set_ipaddresses_config(self.rspec['ip_addresses'])