master(): Rework the while 1 loop so that it's inside the try/except

KeyboardError instead of outside it.  This prevents the anomolous
tracebacks that sometimes occur when ^C is used to kill qrunner.

1 files changed, 4 insertions, 4 deletions

diff --git a/cron/qrunner b/cron/qrunner
index 55b56c661..68e45e266 100644
--- a/cron/qrunner
+++ b/cron/qrunner
@@ -164,8 +164,8 @@ def master(restart, lock):
     else:
         restarting = ''
     try:
-        while 1:
-            try:
+        try:
+            while 1:
                 pid, status = os.wait()
                 killsig = status & 0xff
                 exitstatus = (status >> 8) & 0xff
@@ -189,8 +189,8 @@ qrunner watchdog detected subprocess exit
                     if restart:
                         newpid = start_runner(qrclass, slice, count)
                         kids[newpid] = (qrclass, slice, count)
-            except KeyboardInterrupt:
-                break
+        except KeyboardInterrupt:
+            pass
     finally:
         # Should we leave the main loop for any reason, we want to be sure all
         # of our children are exited cleanly.  Send SIGINTs to all the child