From: Mukund Sivaraman <muks@isc.org>
Date: Fri, 4 May 2012 04:31:31 +0000 (+0530)
Subject: [1790] Don't catch exceptions caused by msgq failures
X-Git-Tag: trac2351_base~226^2~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d05c3695d4b198fbb6bc0e66fa8a2b18db098527;p=thirdparty%2Fkea.git

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

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 3197e04ec2..fd809cd45b 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1577,15 +1577,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.