[svn] commit: r2432 - /trunk/src/bin/xfrout/xfrout.py.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Thu Jul  8 11:06:09 2010
New Revision: 2432

Log:
Avoid socket error caused by shutting down one non-connected socket.

Modified:
    trunk/src/bin/xfrout/xfrout.py.in

Modified: trunk/src/bin/xfrout/xfrout.py.in
==============================================================================
--- trunk/src/bin/xfrout/xfrout.py.in (original)
+++ trunk/src/bin/xfrout/xfrout.py.in Thu Jul  8 11:06:09 2010
@@ -79,10 +79,17 @@
         sock = socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM)
         try:
             self.dns_xfrout_start(sock, msgdata)
+            #TODO, avoid catching all exceptions
         except Exception as e:
             self._log.log_message("error", str(e))
 
-        sock.shutdown(socket.SHUT_RDWR)
+        try:
+            sock.shutdown(socket.SHUT_RDWR)
+        except socket.error:
+            # Avoid socket error caused by shutting down 
+            # one non-connected socket.
+            pass
+
         sock.close()
         os.close(fd)
         pass