BIND 10 trac213-incremental, updated. 5038c63b05eaee1bda68346899ac3f6baf5fbe56 [213] Make the workaround for sockcreator work
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Nov 2 13:58:27 UTC 2011
The branch, trac213-incremental has been updated
via 5038c63b05eaee1bda68346899ac3f6baf5fbe56 (commit)
from 5166d1a65421c3e8515dbcb0d5fcb44c7f400035 (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 5038c63b05eaee1bda68346899ac3f6baf5fbe56
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Nov 2 14:54:54 2011 +0100
[213] Make the workaround for sockcreator work
It broke, since the socket creator no longer has a _procinfo attribute.
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10_src.py.in | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 6fe3693..22882dd 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -618,8 +618,9 @@ class BoB:
Put another process into boss to watch over it. When the process
dies, the info.failed() is called with the exit code.
"""
- self.processes[pid] = info._procinfo
- if info._procinfo is None:
+ if '_procinfo' in dir(info):
+ self.processes[pid] = info._procinfo
+ else:
# XXX: a short term hack. This is the sockcreator.
self.sockcreator = info._SockCreator__creator
@@ -934,9 +935,6 @@ class BoB:
logger.fatal(BIND10_SOCKCREATOR_CRASHED)
self.sockcreator = None
self.runnable = False
- # This was inserted in self.processes by register_process.
- # Now need to remove it.
- del self.processes[pid]
elif pid in self.processes:
# One of the processes we know about. Get information on it.
proc_info = self.processes.pop(pid)
More information about the bind10-changes
mailing list