From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 3 May 2012 04:52:28 +0000 (+0530)
Subject: [1790] Don't use the same log message id twice
X-Git-Tag: trac2351_base~226^2~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5de8f5172aa4becbf65c6918095d23d08bc9d19c;p=thirdparty%2Fkea.git

[1790] Don't use the same log message id twice
---

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 71da0e951c..3197e04ec2 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1554,8 +1554,8 @@ class Xfrin:
                     dclass = RRClass(d["class"])
                 else:
                     dclass = RRClass("IN")
-            except InvalidRRType as err:
-                logger.info(XFRIN_AUTH_CONFIG_ERROR, str(err))
+            except InvalidRRClass as err:
+                logger.info(XFRIN_AUTH_CONFIG_RRCLASS_ERROR, str(err))
                 continue
 
             if d["type"].lower() == "memory" and dclass == zone_class:
@@ -1565,7 +1565,7 @@ class Xfrin:
                     try:
                         name = Name(zone["origin"])
                     except (EmptyLabel, TooLongLabel, BadLabelType, BadEscape, TooLongName, IncompleteName):
-                        logger.info(XFRIN_AUTH_CONFIG_ERROR, str(err))
+                        logger.info(XFRIN_AUTH_CONFIG_NAME_PARSER_ERROR, str(err))
                         continue
 
                     if zone["filetype"].lower() == "sqlite3" and name == zone_name:
diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index 388159e3fe..60d7c9c8e9 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -121,8 +121,11 @@ likely means that the msgq daemon has quit or was killed.
 There was a problem sending a message to b10-auth. This most likely
 means that the msgq daemon has quit or was killed.
 
-% XFRIN_AUTH_CONFIG_ERROR Error parsing Auth configuration: %1
-There was an error when parsing Auth configuration.
+% XFRIN_AUTH_CONFIG_RRCLASS_ERROR Invalid RRClass when parsing Auth configuration: %1
+There was an invalid RR class when parsing Auth configuration.
+
+% XFRIN_AUTH_CONFIG_NAME_PARSER_ERROR Invalid name when parsing Auth configuration: %1
+There was an invalid name when parsing Auth configuration.
 
 % XFRIN_AUTH_LOADZONE sending Auth loadzone for origin=%1, class=%2, datasrc=%3
 There was a successful zone transfer, and the zone is served by b10-auth