include the exception string in the self.log

[util-vserver-pl.git] / python / vserver.py

diff --git a/python/vserver.py b/python/vserver.py
index e4afacd..44341a6 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -207,7 +207,7 @@ class VServer:
                     resource.setrlimit(resource_type, lim)
             except OSError, e:
                 self.log("Error: setrlimit(%d, %s, %d, %d, %d): %s"
-                         % (self.ctx, type.lower(), hard, soft, min))
+                         % (self.ctx, type.lower(), hard, soft, min, e))
 
         return update
 
@@ -467,7 +467,7 @@ class VServer:
                 # open state file to record vserver info
                 state_file = open("/var/run/vservers/%s" % self.name, "w")
 
-                # use /dev/null for stdin, /var/log/boot.log for stdout/err
+                # use /dev/null for stdin, /var/log/nm for stdout/err
                 fd = os.open("/dev/null", os.O_RDONLY)
                 if fd != 0:
                     os.dup2(fd, 0)
@@ -478,7 +478,10 @@ class VServer:
 
                 self.config.cache_it()
                 self.__do_chroot()
-                removed = self.__cleanvar()
+                if not self.is_running():
+                    removed = self.__cleanvar()
+                else:
+                    removed = 0
 
                 log = open("/var/log/nm", "a", 0)
                 if log.fileno() != 1: