From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 18 Jun 2012 18:37:04 +0000 (+0530)
Subject: Revert "[1828] Make code safer in case socket.socket() raises an exception"
X-Git-Tag: trac2351_base~226^2~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fafcf498b18734dd6529396eef317d985adde52;p=thirdparty%2Fkea.git

Revert "[1828] Make code safer in case socket.socket() raises an exception"

This reverts commit e295b40a31dedb3671705ab44c2683624f3d541c.
---

diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 89bf701f89..23303333ac 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -804,13 +804,13 @@ class UnixSockServer(socketserver_mixin.NoPollMixIn,
         '''Check whether the socket file 'sock_file' exists and
         is being used by one running xfrout process. If it is,
         return True, or else return False. '''
-        try:
-            with socket.socket(socket.AF_UNIX) as sock:
+        with socket.socket(socket.AF_UNIX) as sock:
+            try:
                 sock.connect(sock_file)
-        except socket.error as err:
-            return False
-        else:
-            return True
+            except socket.error as err:
+                return False
+            else:
+                return True
 
     def shutdown(self):
         self._write_sock.send(b"shutdown") #terminate the xfrout session thread