[svn] commit: r1088 - /trunk/src/bin/bind10/bind10.py.in

[BIND 10 source code commits]

Author: shane
Date: Wed Mar  3 08:39:10 2010
New Revision: 1088

Log:
Cleanup shutdown messages a bit.


Modified:
    trunk/src/bin/bind10/bind10.py.in

Modified: trunk/src/bin/bind10/bind10.py.in
==============================================================================
--- trunk/src/bin/bind10/bind10.py.in (original)
+++ trunk/src/bin/bind10/bind10.py.in Wed Mar  3 08:39:10 2010
@@ -322,7 +322,7 @@
                     sys.stdout.write("Process %s (PID %d) died.\n" % 
                                      (proc_info.name, proc_info.pid))
                 if proc_info.name == "msgq":
-                    if self.verbose:
+                    if self.verbose and self.runnable:
                         sys.stdout.write(
                                      "The msgq process died, shutting down.\n")
                     self.runnable = False
@@ -482,6 +482,10 @@
     wakeup_fd = wakeup_pipe[0]
     ccs_fd = boss_of_bind.ccs.get_socket().fileno()
     while boss_of_bind.runnable:
+        # clean up any processes that exited
+        boss_of_bind.reap_children()
+        boss_of_bind.restart_processes()
+
         # XXX: get time for next restart for timeout
 
         # select() can raise EINTR when a signal arrives, 
@@ -502,10 +506,6 @@
             elif fd == wakeup_fd:
                 os.read(wakeup_fd, 32)
 
-        # clean up any processes that exited
-        boss_of_bind.reap_children()
-        boss_of_bind.restart_processes()
-
     # shutdown
     signal.signal(signal.SIGCHLD, signal.SIG_DFL)
     boss_of_bind.shutdown()