BIND 10 trac762, updated. f9b5323ae8c8ffd7d4d2b69c360dc497b935d6de [trac762] final comments
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jun 27 19:43:31 UTC 2011
The branch, trac762 has been updated
via f9b5323ae8c8ffd7d4d2b69c360dc497b935d6de (commit)
from 8ec67a677e0ee2ecab48d112c3c5f5a5c5753543 (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 f9b5323ae8c8ffd7d4d2b69c360dc497b935d6de
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Jun 27 21:43:20 2011 +0200
[trac762] final comments
-----------------------------------------------------------------------
Summary of changes:
src/bin/xfrout/xfrout.py.in | 2 +-
src/bin/xfrout/xfrout_messages.mes | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 94132a9..a75ff22 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -506,7 +506,7 @@ class UnixSockServer(socketserver_mixin.NoPollMixIn, ThreadingUnixStreamServer):
try:
os.unlink(self._sock_file)
except Exception as e:
- logger.error(XFROUT_REMOVE_UNIX_SOCKET_FILE_ERROR, str(e))
+ logger.error(XFROUT_REMOVE_UNIX_SOCKET_FILE_ERROR, self._sock_file, str(e))
pass
def update_config_data(self, new_config):
diff --git a/src/bin/xfrout/xfrout_messages.mes b/src/bin/xfrout/xfrout_messages.mes
index e13e8f2..2dada54 100644
--- a/src/bin/xfrout/xfrout_messages.mes
+++ b/src/bin/xfrout/xfrout_messages.mes
@@ -16,7 +16,8 @@
# of the xfrout messages python module.
% XFROUT_AXFR_TRANSFER_DONE transfer of %1/%2 complete
-The transfer of the given zone has been completed successfully.
+The transfer of the given zone has been completed successfully, or was
+aborted due to a shutdown event.
% XFROUT_AXFR_TRANSFER_ERROR error transferring zone %1/%2: %3
An uncaught exception was encountered while sending the response to
@@ -65,7 +66,7 @@ ensure the daemon keeps running, this error is caught and reported.
There was an error importing a python module. One of the modules needed
by xfrout could not be found. This suggests that either some libraries
are missing on the system, or the PYTHONPATH variable is not correct.
-The specific place where this library needs to be may depends on your
+The specific place where this library needs to be depends on your
system and your specific installation.
% XFROUT_NEW_CONFIG Update xfrout configuration
@@ -118,9 +119,10 @@ daemon will shut down.
% XFROUT_SOCKET_SELECT_ERROR error while calling select() on request socket: %1
There was an error while calling select() on the socket that informs
-the xfrout daemon that a new xfrout request has arrived. This most
-likely points to an error in the internal communication with b10-auth.
-The error is included in the log message.
+the xfrout daemon that a new xfrout request has arrived. This should
+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_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
There was a keyboard interrupt signal to stop the xfrout daemon. The
More information about the bind10-changes
mailing list