[svn] commit: r2936 - /branches/trac312/src/bin/bind10/bind10.py.in

[BIND 10 source code commits]

Author: jelte
Date: Thu Sep 16 11:12:37 2010
New Revision: 2936

Log:
a well-timed ctrl-c may stop msgq before bind10, in which case 0-bytes are read, which is now an error. Catch that error and break from the for loop, so bob will go into shutdown mode cleanly

Modified:
    branches/trac312/src/bin/bind10/bind10.py.in

Modified: branches/trac312/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac312/src/bin/bind10/bind10.py.in (original)
+++ branches/trac312/src/bin/bind10/bind10.py.in Thu Sep 16 11:12:37 2010
@@ -735,7 +735,12 @@
 
         for fd in rlist + xlist:
             if fd == ccs_fd:
-                boss_of_bind.ccs.check_command()
+                try:
+                    boss_of_bind.ccs.check_command()
+                except isc.cc.session.ProtocolError:
+                    if options.verbose:
+                        sys.stderr.write("[bind10] msgq channel disappeared.\n")
+                    break
             elif fd == wakeup_fd:
                 os.read(wakeup_fd, 32)