Merge "Correct a possible DNSService connection leak" into stable/kilo

openstack · Nov 30, 2015 · a170caa · a170caa
2 parents d2026cc + 3bf88e6
commit a170caa
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/designate/service.py b/designate/service.py
@@ -366,15 +366,16 @@ def _dns_handle(self, addr, payload, client=None):
                         # Handle UDP Responses
                         self._dns_sock_udp.sendto(response, addr)
 
-            # Close the TCP connection if we have one.
-            if client:
-                client.close()
-
         except Exception:
             LOG.exception(_LE("Unhandled exception while processing request "
                               "from %(host)s:%(port)d") %
                           {'host': addr[0], 'port': addr[1]})
 
+        # Close the TCP connection if we have one.
+        if client:
+            client.close()
+
+
 _launcher = None