BIND 10 trac1818, updated. 975a07c582ce11c7649178a868e440b45e380b8b [1818] Log cc startup as info message
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Apr 11 11:59:53 UTC 2012
The branch, trac1818 has been updated
via 975a07c582ce11c7649178a868e440b45e380b8b (commit)
via 1f9486ea7a7b89dcdd8cfb4cb33bdf8310fcf217 (commit)
via 79691cef8fcb3ac78c2b91edc94afed4639a9e3b (commit)
via 41c92a1ac2360cb5586f3b9997617ce94fc6d9a9 (commit)
via 17461e70c3c2beff5350a0ab6b6b90ac9ddde43e (commit)
from df9b61bbd3088869488d0b83357f39957c3a6a1a (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 975a07c582ce11c7649178a868e440b45e380b8b
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 11 16:11:46 2012 +0530
[1818] Log cc startup as info message
commit 1f9486ea7a7b89dcdd8cfb4cb33bdf8310fcf217
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 11 15:55:22 2012 +0530
[1818] Wait for components to start before testing them
commit 79691cef8fcb3ac78c2b91edc94afed4639a9e3b
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 11 15:51:06 2012 +0530
[1818] Log components startup properly
commit 41c92a1ac2360cb5586f3b9997617ce94fc6d9a9
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 11 13:07:39 2012 +0530
[1818] Fix argument list in wait_for_stdout_message()
commit 17461e70c3c2beff5350a0ab6b6b90ac9ddde43e
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Apr 11 13:07:18 2012 +0530
[1818] Use different function names for stderr and stdout waiters
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10_src.py.in | 2 +-
src/bin/xfrin/xfrin.py.in | 1 +
src/bin/xfrin/xfrin_messages.mes | 5 +++--
src/bin/xfrout/xfrout.py.in | 1 +
src/bin/xfrout/xfrout_messages.mes | 4 ++++
src/bin/zonemgr/zonemgr.py.in | 1 +
src/bin/zonemgr/zonemgr_messages.mes | 4 ++++
tests/lettuce/features/bindctl_commands.feature | 18 ++++++++++++++++++
tests/lettuce/features/default.feature | 6 ++++++
tests/lettuce/features/terrain/steps.py | 4 ++--
10 files changed, 41 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index edc1b69..cbca28d 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -501,7 +501,7 @@ class BoB:
self.command_handler,
socket_file = self.msgq_socket_file)
self.ccs.start()
- logger.debug(DBG_PROCESS, BIND10_STARTED_CC)
+ logger.info(BIND10_STARTED_CC)
# A couple of utility methods for starting processes...
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 863c5b9..fd13883 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1502,6 +1502,7 @@ class Xfrin:
logger.error(XFRIN_MSGQ_SEND_ERROR_ZONE_MANAGER, ZONE_MANAGER_MODULE_NAME)
def startup(self):
+ logger.info(XFRIN_STARTED)
while not self._shutdown_event.is_set():
self._cc_check_command()
diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index eae1c69..25a1fc1 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -129,8 +129,9 @@ zone is not known to the system. This may indicate that the configuration
for xfrin is incomplete, or there was a typographical error in the
zone name in the configuration.
-% XFRIN_STARTING starting resolver with command line '%1'
-An informational message, this is output when the resolver starts up.
+% XFRIN_STARTED xfrin started
+This informational message is output by xfrin when all initialization
+has been completed and it is entering its main loop.
% XFRIN_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
There was a keyboard interrupt signal to stop the xfrin daemon. The
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 8f236ec..3379886 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -1002,6 +1002,7 @@ class XfroutServer:
def run(self):
'''Get and process all commands sent from cfgmgr or other modules. '''
+ logger.info(XFROUT_STARTED)
while not self._shutdown_event.is_set():
self._cc.check_command(False)
diff --git a/src/bin/xfrout/xfrout_messages.mes b/src/bin/xfrout/xfrout_messages.mes
index fcc2e59..9996a5a 100644
--- a/src/bin/xfrout/xfrout_messages.mes
+++ b/src/bin/xfrout/xfrout_messages.mes
@@ -133,6 +133,10 @@ be a result of rare local error such as memory allocation failure and
shouldn't happen under normal conditions. The error is included in the
log message.
+% XFROUT_STARTED xfrout started
+This informational message is output by xfrout when all initialization
+has been completed and it is entering its main loop.
+
% XFROUT_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
There was a keyboard interrupt signal to stop the xfrout daemon. The
daemon will now shut down.
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index 7b16f1b..bbb0e62 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -657,6 +657,7 @@ class Zonemgr:
return answer
def run(self):
+ logger.info(ZONEMGR_STARTED)
self.running = True
try:
while not self._shutdown_event.is_set():
diff --git a/src/bin/zonemgr/zonemgr_messages.mes b/src/bin/zonemgr/zonemgr_messages.mes
index 8abec5d..ad0954f 100644
--- a/src/bin/zonemgr/zonemgr_messages.mes
+++ b/src/bin/zonemgr/zonemgr_messages.mes
@@ -67,6 +67,10 @@ zone manager to record the master server for the zone and start a timer;
when the timer expires, the master will be polled to see if it contains
new data.
+% ZONEMGR_STARTED zonemgr started
+This informational message is output by zonemgr when all initialization
+has been completed and it is entering its main loop.
+
% ZONEMGR_RECEIVE_SHUTDOWN received SHUTDOWN command
This is a debug message indicating that the zone manager has received
a SHUTDOWN command over the command channel from the Boss process.
diff --git a/tests/lettuce/features/bindctl_commands.feature b/tests/lettuce/features/bindctl_commands.feature
index 541d993..96527b7 100644
--- a/tests/lettuce/features/bindctl_commands.feature
+++ b/tests/lettuce/features/bindctl_commands.feature
@@ -10,6 +10,13 @@ Feature: control with bindctl
# currently less standardized than 'help')
Given I have bind10 running with configuration example.org.config
+ And wait for bind10 stderr message ZONEMGR_STARTED
+ And wait for bind10 stderr message AUTH_SERVER_STARTED
+ And wait for bind10 stderr message XFRIN_STARTED
+ And wait for bind10 stderr message XFROUT_STARTED
+ And wait for bind10 stderr message STATS_STARTING
+ And wait for bind10 stderr message STATHTTPD_STARTED
+
Then remove bind10 configuration Boss/components/NOSUCHMODULE
last bindctl output should contain Error
@@ -21,14 +28,25 @@ Feature: control with bindctl
bind10 module StatsHttpd should be running
Then remove bind10 configuration Boss/components value b10-xfrout
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
last bindctl output should not contain Error
# assuming it won't error for further modules (if it does, the final
# 'should not be running' tests would fail anyway)
Then remove bind10 configuration Boss/components value b10-stats-httpd
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+ last bindctl output should not contain Error
Then remove bind10 configuration Boss/components value b10-stats
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+ last bindctl output should not contain Error
Then remove bind10 configuration Boss/components value b10-zonemgr
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+ last bindctl output should not contain Error
Then remove bind10 configuration Boss/components value b10-xfrin
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+ last bindctl output should not contain Error
Then remove bind10 configuration Boss/components value b10-auth
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+ last bindctl output should not contain Error
bind10 module Xfrout should not be running
bind10 module Zonemgr should not be running
diff --git a/tests/lettuce/features/default.feature b/tests/lettuce/features/default.feature
index d3115e6..18f952a 100644
--- a/tests/lettuce/features/default.feature
+++ b/tests/lettuce/features/default.feature
@@ -4,10 +4,16 @@ Feature: default bind10 config
Scenario: Check that only the default components are running
Given I have bind10 running with configuration default.config
+ And wait for bind10 stderr message STATS_STARTING
+ And wait for bind10 stderr message STATHTTPD_STARTED
+
+ # These should be running
bind10 module Boss should be running
bind10 module Logging should be running
bind10 module Stats should be running
bind10 module StatsHttpd should be running
+
+ # These should not be running
bind10 module Resolver should not be running
bind10 module Xfrout should not be running
bind10 module Zonemgr should not be running
diff --git a/tests/lettuce/features/terrain/steps.py b/tests/lettuce/features/terrain/steps.py
index 4b199d6..49ac3ee 100644
--- a/tests/lettuce/features/terrain/steps.py
+++ b/tests/lettuce/features/terrain/steps.py
@@ -31,7 +31,7 @@ def stop_a_named_process(step, process_name):
world.processes.stop_process(process_name)
@step('wait for (new )?(\w+) stderr message (\w+)(?: not (\w+))?')
-def wait_for_message(step, new, process_name, message, not_message):
+def wait_for_stderr_message(step, new, process_name, message, not_message):
"""
Block until the given message is printed to the given process's stderr
output.
@@ -51,7 +51,7 @@ def wait_for_message(step, new, process_name, message, not_message):
assert found != not_message, line
@step('wait for (new )?(\w+) stdout message (\w+)(?: not (\w+))?')
-def wait_for_message(step, process_name, message, not_message):
+def wait_for_stdout_message(step, new, process_name, message, not_message):
"""
Block until the given message is printed to the given process's stdout
output.
More information about the bind10-changes
mailing list