* Slices w/ initscripts were starting repeatedly because the flag that signals the...

diff --git a/accounts.py b/accounts.py
index 3413e9c..efac0ad 100644 (file)
--- a/accounts.py
+++ b/accounts.py
@@ -146,8 +146,11 @@ class Worker:
     def _stop(self): self._acct.stop()
 
     def is_running(self): 
     def _stop(self): self._acct.stop()
 
     def is_running(self): 

-        status = self._acct.is_running()
-        if not status:  logger.verbose("Worker(%s): is not running" % self.name)
+        if self._acct.is_running():
+            status = True
+        else:
+            status = False
+            logger.verbose("Worker(%s): is not running" % self.name)

         return status
 
     def _destroy(self, curr_class):
         return status
 
     def _destroy(self, curr_class):

diff --git a/sliver_vs.py b/sliver_vs.py
index 7206add..f75bf01 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -174,6 +174,8 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         if self.rspec['enabled'] > 0:
             logger.log('%s: starting in %d seconds' % (self.name, delay))
             time.sleep(delay)
         if self.rspec['enabled'] > 0:
             logger.log('%s: starting in %d seconds' % (self.name, delay))
             time.sleep(delay)

+            # VServer.start calls fork() internally, 
+            # so just close the nonstandard fds and fork once to avoid creating zombies

             child_pid = os.fork()
             if child_pid == 0:
                 if self.initscriptchanged:
             child_pid = os.fork()
             if child_pid == 0:
                 if self.initscriptchanged:


@@ -185,14 +187,13 @@ class Sliver_VS(accounts.Account, vserver.VServer):
                         os.close(fd)
                     try:
                         self.chroot_call(install_initscript)
                         os.close(fd)
                     try:
                         self.chroot_call(install_initscript)

-                        self.initscriptchanged = False

                     except: logger.log_exc(self.name)
                     except: logger.log_exc(self.name)

-                # VServer.start calls fork() internally, 
-                # so just close the nonstandard fds and fork once to avoid creating zombies

                 tools.close_nonstandard_fds()
                 vserver.VServer.start(self)
                 os._exit(0)
                 tools.close_nonstandard_fds()
                 vserver.VServer.start(self)
                 os._exit(0)

-            else: os.waitpid(child_pid, 0)
+            else: 
+                os.waitpid(child_pid, 0)
+                self.initscriptchanged = False

         else: logger.log('%s: not starting, is not enabled' % self.name)
 
     def stop(self):
         else: logger.log('%s: not starting, is not enabled' % self.name)
 
     def stop(self):