BIND 10 trac1790, updated. 2e94c1ca0ccd402a4707745722f2ff66ba2e5557 [1790] Don't catch exceptions caused by msgq failures

BIND 10 source code commits bind10-changes at lists.isc.org
Fri May 4 04:38:54 UTC 2012


The branch, trac1790 has been updated
       via  2e94c1ca0ccd402a4707745722f2ff66ba2e5557 (commit)
       via  100f804696ee76887cefb685ab80ffb14be65b06 (commit)
      from  f2c25b53985bf2c5e3b4e5d9aaffca1b0dccc2e4 (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 2e94c1ca0ccd402a4707745722f2ff66ba2e5557
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri May 4 10:01:31 2012 +0530

    [1790] Don't catch exceptions caused by msgq failures

commit 100f804696ee76887cefb685ab80ffb14be65b06
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri May 4 09:55:19 2012 +0530

    [1790] When throwing RR parameter exceptions, include the bad string as well

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.py.in                  |   11 ++---------
 src/lib/dns/rrparamregistry-placeholder.cc |    2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 2afb876..7beb5a5 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1578,15 +1578,8 @@ class Xfrin:
                                      param["origin"], param["class"], param["datasrc"])
 
                         msg = create_command("loadzone", param)
-                        # catch the exception, in case msgq has been killed.
-                        try:
-                            seq = self._send_cc_session.group_sendmsg(msg, AUTH_MODULE_NAME)
-                            try:
-                                answer, env = self._send_cc_session.group_recvmsg(False, seq)
-                            except isc.cc.session.SessionTimeout:
-                                pass        # for now we just ignore the failure
-                        except socket.error as err:
-                            logger.error(XFRIN_MSGQ_SEND_ERROR_AUTH, AUTH_MODULE_NAME)
+                        seq = self._send_cc_session.group_sendmsg(msg, AUTH_MODULE_NAME)
+                        answer, env = self._send_cc_session.group_recvmsg(False, seq)
 
     def publish_xfrin_news(self, zone_name, zone_class, xfr_result):
         '''Send command to xfrout/zone manager module.
diff --git a/src/lib/dns/rrparamregistry-placeholder.cc b/src/lib/dns/rrparamregistry-placeholder.cc
index 62a9e34..8b01e41 100644
--- a/src/lib/dns/rrparamregistry-placeholder.cc
+++ b/src/lib/dns/rrparamregistry-placeholder.cc
@@ -401,7 +401,7 @@ textToCode(const string& code_str, MS& stringmap) {
             return (code);
         }
     }
-    isc_throw(ET, "Unrecognized RR parameter string");
+    isc_throw(ET, "Unrecognized RR parameter string: " + code_str);
 }
 
 template <typename PT, typename MC>



More information about the bind10-changes mailing list