BIND 10 trac758, updated. ee8c5f5bee062c8943e955184146d839c05bd2da [trac758] change logger and root name and level of starting messages
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Jul 1 11:27:29 UTC 2011
The branch, trac758 has been updated
via ee8c5f5bee062c8943e955184146d839c05bd2da (commit)
via 9ef0e6eeb1ec8477b1f6867d118d4c599f41c0ae (commit)
via 05c064b4bd3ea51553a34e37099aa1053c141060 (commit)
from 690a04dcd63dce08a69e648223320e922f82b3d6 (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 ee8c5f5bee062c8943e955184146d839c05bd2da
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Jul 1 13:27:09 2011 +0200
[trac758] change logger and root name and level of starting messages
commit 9ef0e6eeb1ec8477b1f6867d118d4c599f41c0ae
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Jul 1 13:20:21 2011 +0200
[trac758] change address:port notation to address#port
commit 05c064b4bd3ea51553a34e37099aa1053c141060
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Jul 1 12:55:09 2011 +0200
[trac758] addressed (most of the) review comments
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10.py.in | 20 +++++++++++---------
src/bin/bind10/bind10_messages.mes | 26 +++++++++++---------------
2 files changed, 22 insertions(+), 24 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10.py.in b/src/bin/bind10/bind10.py.in
index e9e23a9..6e4997d 100755
--- a/src/bin/bind10/bind10.py.in
+++ b/src/bin/bind10/bind10.py.in
@@ -68,8 +68,8 @@ import isc.net.parse
import isc.log
from bind10_messages import *
-isc.log.init("b10-bind10")
-logger = isc.log.Logger("bind10")
+isc.log.init("b10-boss")
+logger = isc.log.Logger("boss")
# Pending system-wide debug level definitions, the ones we
# use here are hardcoded for now
@@ -262,7 +262,7 @@ class BoB:
if new_config['start_' + name]:
if not started:
if self.uid is not None:
- logger.warn(BIND10_START_AS_NON_ROOT, name)
+ logger.info(BIND10_START_AS_NON_ROOT, name)
start()
else:
stop()
@@ -368,7 +368,8 @@ class BoB:
def log_starting(self, process, port = None, address = None):
"""
A convenience function to output a "Starting xxx" message if the
- verbose option is set. Putting this into a separate method ensures
+ logging is set to DEBUG with debuglevel DBG_PROCESS or higher.
+ Putting this into a separate method ensures
that the output form is consistent across all processes.
The process name (passed as the first argument) is put into
@@ -379,12 +380,12 @@ class BoB:
"""
self.curproc = process
if port is None and address is None:
- logger.debug(DBG_PROCESS, BIND10_STARTING_PROCESS, self.curproc)
+ logger.info(BIND10_STARTING_PROCESS, self.curproc)
elif address is None:
- logger.debug(DBG_PROCESS, BIND10_STARTING_PROCESS_PORT, self.curproc,
+ logger.info(BIND10_STARTING_PROCESS_PORT, self.curproc,
port)
else:
- logger.debug(DBG_PROCESS, BIND10_STARTING_PROCESS_PORT_ADDRESS,
+ logger.info(BIND10_STARTING_PROCESS_PORT_ADDRESS,
self.curproc, address, port)
def log_started(self, pid = None):
@@ -757,10 +758,10 @@ class BoB:
# elsewhere.
if self.runnable:
if exit_status is None:
- logger.info(BIND10_PROCESS_ENDED_NO_EXIT_STATUS,
+ logger.warn(BIND10_PROCESS_ENDED_NO_EXIT_STATUS,
proc_info.name, proc_info.pid)
else:
- logger.info(BIND10_PROCESS_ENDED_WITH_EXIT_STATUS,
+ logger.warn(BIND10_PROCESS_ENDED_WITH_EXIT_STATUS,
proc_info.name, proc_info.pid,
exit_status)
@@ -1022,6 +1023,7 @@ def main():
boss_of_bind.ccs.check_command()
except isc.cc.session.ProtocolError:
logger.fatal(BIND10_MSGQ_DISAPPEARED)
+ self.runnable = False
break
elif fd == wakeup_fd:
os.read(wakeup_fd, 32)
diff --git a/src/bin/bind10/bind10_messages.mes b/src/bin/bind10/bind10_messages.mes
index e2cc17f..3f5f637 100644
--- a/src/bin/bind10/bind10_messages.mes
+++ b/src/bin/bind10/bind10_messages.mes
@@ -28,21 +28,21 @@ started according to the configuration.
This message shows whether or not the resolver should be
started according to the configuration.
-% BIND10_INVALID_USER invalid user: '%1'
+% BIND10_INVALID_USER invalid user: %1
The boss process was started with the -u option, to drop root privileges
and continue running as the specified user, but the user is unknown.
% BIND10_KILL_PROCESS killing process %1
-The boss module is sending a kill signal to the given process, as part
-of the process of killing all started processes during a failed startup,
-as described for BIND10_KILLING_ALL_PROCESSES
+The boss module is sending a kill signal to process with the given name,
+as part of the process of killing all started processes during a failed
+startup, as described for BIND10_KILLING_ALL_PROCESSES
% BIND10_KILLING_ALL_PROCESSES killing all started processes
The boss module was not able to start every process it needed to start
during startup, and will now kill the processes that did get started.
% BIND10_MSGQ_ALREADY_RUNNING msgq daemon already running, cannot start
-There already appears to me a message bus daemon running. Either an
+There already appears to be a message bus daemon running. Either an
old process was not shut down correctly, and needs to be killed, or
another instance of BIND10, with the same msgq domain socket, is
running, which needs to be stopped.
@@ -58,12 +58,8 @@ inconsistent state of the system, and BIND 10 will now shut down.
% BIND10_PROCESS_ENDED_NO_EXIT_STATUS process %1 (PID %2) died: exit status not available
The given process ended unexpectedly, but no exit status is
-available. Depending on which module it was, it may simply be
-restarted, or it may be a problem that will cause the boss module to
-shut down too. The latter happens if it was the message bus daemon,
-which, if it has died suddenly, may leave the system in an
-inconsistent state. BIND10 will also shut down now if it has been run
-with --brittle.
+available. See BIND10_PROCESS_ENDED_WITH_EXIT_STATUS for a longer
+description.
% BIND10_PROCESS_ENDED_WITH_EXIT_STATUS process %1 (PID %2) terminated, exit status = %3
The given process ended unexpectedly with the given exit status.
@@ -109,7 +105,7 @@ The boss module is sending a SIGTERM signal to the given process.
% BIND10_SHUTDOWN stopping the server
The boss process received a command or signal telling it to shut down.
-It will send shutdown commands to each process. The processes that do
+It will send a shutdown command to each process. The processes that do
not shut down will then receive a SIGTERM signal. If that doesn't work,
it shall send SIGKILL signals to the processes still alive.
@@ -122,7 +118,7 @@ The given module is being started or restarted without root privileges.
If the module needs these privileges, it may have problems starting.
Note that this issue should be resolved by the pending 'socket-creator'
process; once that has been implemented, modules should not need root
-privileges anymore.
+privileges anymore. See tickets #800 and #801 for more information.
% BIND10_STARTED_PROCESS started %1
The given process has successfully been started.
@@ -140,9 +136,9 @@ The boss module is starting the given process.
The boss module is starting the given process, which will listen on the
given port number.
-% BIND10_STARTING_PROCESS_PORT_ADDRESS starting process %1 (to listen on %2:%3)
+% BIND10_STARTING_PROCESS_PORT_ADDRESS starting process %1 (to listen on %2#%3)
The boss module is starting the given process, which will listen on the
-given address and port number.
+given address and port number (written as <address>#<port>).
% BIND10_STARTUP_COMPLETE BIND 10 started
All modules have been successfully started, and BIND 10 is now running.
More information about the bind10-changes
mailing list