BIND 10 master, updated. 016925ef2437e0396127e135c937d3a55539d224 [2608] Kill msgq if we cannot connect to it on startup When the boss process was unable to connect to the msgq, it would exit. However, it would leave the msgq process running. This patch fixes that by killing the msgq if it is running in this case.

[BIND 10 source code commits]

The branch, master has been updated
       via  016925ef2437e0396127e135c937d3a55539d224 (commit)
      from  c4df99eac2910af079f19b0bdacc95d7cd88192f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 016925ef2437e0396127e135c937d3a55539d224
Author: Shane Kerr <shane at isc.org>
Date:   Mon Jan 21 20:21:41 2013 +0100

    [2608] Kill msgq if we cannot connect to it on startup
    When the boss process was unable to connect to the msgq, it would
    exit. However, it would leave the msgq process running. This patch
    fixes that by killing the msgq if it is running in this case.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/bind10/bind10_src.py.in |    2 ++
 1 file changed, 2 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 6fe5485..9f41804 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -491,6 +491,8 @@ class BoB:
 
             # if we have been trying for "a while" give up
             if (time.time() - cc_connect_start) > self.msgq_timeout:
+                if msgq_proc.process:
+                    msgq_proc.process.kill()
                 logger.error(BIND10_CONNECTING_TO_CC_FAIL)
                 raise CChannelConnectError("Unable to connect to c-channel after 5 seconds")