Browse Source

[trac761] address stephen's comments

Jelte Jansen 14 years ago
parent
commit
1efa5d9d7f
2 changed files with 7 additions and 9 deletions
  1. 2 5
      src/bin/xfrin/xfrin.py.in
  2. 5 4
      src/bin/xfrin/xfrin_messages.mes

+ 2 - 5
src/bin/xfrin/xfrin.py.in

@@ -32,7 +32,7 @@ import isc.net.parse
 from xfrin_messages import *
 
 isc.log.init("b10-xfrin")
-logger = isc.log.Logger("b10-xfrin")
+logger = isc.log.Logger("xfrin")
 
 try:
     from pydnspp import *
@@ -74,9 +74,6 @@ __version__ = 'BIND10'
 XFRIN_OK = 0
 XFRIN_FAIL = 1
 
-def log_error(msg):
-    raise DONOTCALLMEEVER
-
 class XfrinException(Exception):
     pass
 
@@ -281,7 +278,7 @@ class XfrinConnection(asyncore.dispatcher):
             ret = XFRIN_FAIL
             #TODO, recover data source.
         except isc.datasrc.sqlite3_ds.Sqlite3DSError as e:
-            logger.error(XFRIN_AXFR_DB_FAILURE, self._zone_name, str(e))
+            logger.error(XFRIN_AXFR_DATABASE_FAILURE, self._zone_name, str(e))
             ret = XFRIN_FAIL
         except UserWarning as e:
             # XXX: this is an exception from our C++ library via the

+ 5 - 4
src/bin/xfrin/xfrin_messages.mes

@@ -36,16 +36,17 @@ the SOA record has been checked, and a zone transfer has been started.
 The AXFR transfer of the given zone was successfully completed.
 
 % XFRIN_BAD_MASTER_ADDR_FORMAT bad format for master address: %1
-The given master address is not a valid IP address
+The given master address is not a valid IP address.
 
 % XFRIN_BAD_MASTER_PORT_FORMAT bad format for master port: %1
-The given master port is not a valid port number
+The master port as read from the configuration is not a valid port number.
 
 % XFRIN_BAD_TSIG_KEY_STRING bad TSIG key string: %1
-The given string does not represent a valid TSIG key.
+The TSIG key string as read from the configuration does not represent
+a valid TSIG key.
 
 % XFRIN_BAD_ZONE_CLASS Invalid zone class: %1
-The given zone class is not a valid DNS class.
+The zone class as read from the configuration is not a valid DNS class.
 
 % XFRIN_CC_SESSION_ERROR error reading from cc channel: %1
 There was a problem reading from the command and control channel. The