Clean up unreachable code for dnsdist

- Remove unreachable cleanup
- Use finally for cleanup

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

diff --git a/regression-tests.dnsdist/proxyprotocolutils.py b/regression-tests.dnsdist/proxyprotocolutils.py
index 4f7659fee2b354dd6b33644927a11c82ea462442..5fb548140a8c85f5b8f561119c150d3d82c6dade 100644 (file)
--- a/regression-tests.dnsdist/proxyprotocolutils.py
+++ b/regression-tests.dnsdist/proxyprotocolutils.py
@@ -50,8 +50,6 @@ def ProxyProtocolUDPResponder(port, fromQueue, toQueue):
         sock.sendto(response.to_wire(), addr)
         sock.settimeout(None)
 
-    sock.close()
-
 def ProxyProtocolTCPResponder(port, fromQueue, toQueue):
     # be aware that this responder will not accept a new connection
     # until the last one has been closed. This is done on purpose to
@@ -116,5 +114,3 @@ def ProxyProtocolTCPResponder(port, fromQueue, toQueue):
           conn.send(wire)
 
         conn.close()
-
-    sock.close()

diff --git a/regression-tests.dnsdist/test_Carbon.py b/regression-tests.dnsdist/test_Carbon.py
index d697fc8a1279c88d50878725a0a494bdd55e4d1b..63f09f2626ba92e700554b8e1bd20de6a92b9e02 100644 (file)
--- a/regression-tests.dnsdist/test_Carbon.py
+++ b/regression-tests.dnsdist/test_Carbon.py
@@ -59,7 +59,6 @@ class TestCarbon(DNSDistTest):
                 cls._carbonCounters[threading.current_thread().name] = 1
 
             conn.close()
-        sock.close()
 
     @classmethod
     def startResponders(cls):

diff --git a/regression-tests.dnsdist/test_Dnstap.py b/regression-tests.dnsdist/test_Dnstap.py
index 0e7a2f2b20b977a009f3dbbad9506da1025f9e7d..861749519eb603fb686ecb1f3575b3fc57a6ce40 100644 (file)
--- a/regression-tests.dnsdist/test_Dnstap.py
+++ b/regression-tests.dnsdist/test_Dnstap.py
@@ -176,7 +176,6 @@ class TestDnstapOverRemoteLogger(DNSDistTest):
                 cls._remoteLoggerQueue.put(data, True, timeout=2.0)
 
             conn.close()
-        sock.close()
 
     @classmethod
     def startResponders(cls):
@@ -389,15 +388,17 @@ class TestDnstapOverRemoteLoggerPool(DNSDistTest):
             conn.close()
 
         threads = []
-        while True:
-            (conn, _) = sock.accept()
-            thread = threading.Thread(target=handle_connection, args=[conn])
-            threads.append(thread)
-            thread.start()
 
-        for thread in threads:
-            thread.join()
-        sock.close()
+        try:
+            while True:
+                (conn, _) = sock.accept()
+                thread = threading.Thread(target=handle_connection, args=[conn])
+                threads.append(thread)
+                thread.start()
+        finally:
+            for thread in threads:
+                thread.join()
+            sock.close()
 
     @classmethod
     def startResponders(cls):
@@ -632,12 +633,14 @@ class TestDnstapOverFrameStreamUnixLogger(DNSDistTest):
             sys.exit(1)
 
         sock.listen(100)
-        while True:
-            (conn, _) = sock.accept()
-            fstrm_handle_bidir_connection(conn, lambda data: \
-                cls._fstrmLoggerQueue.put(data, True, timeout=2.0))
-            conn.close()
-        sock.close()
+        try:
+            while True:
+                (conn, _) = sock.accept()
+                fstrm_handle_bidir_connection(conn, lambda data: \
+                    cls._fstrmLoggerQueue.put(data, True, timeout=2.0))
+                conn.close()
+        finally:
+            sock.close()
 
     @classmethod
     def startResponders(cls):
@@ -755,15 +758,18 @@ class TestDnstapOverRemotePoolUnixLogger(DNSDistTest):
             conn.close()
 
         threads = []
-        while True:
-            (conn, _) = sock.accept()
-            thread = threading.Thread(target=handle_connection, args=[conn])
-            threads.append(thread)
-            thread.start()
 
-        for thread in threads:
-            thread.join()
-        sock.close()
+        try:
+            while True:
+                (conn, _) = sock.accept()
+                thread = threading.Thread(target=handle_connection, args=[conn])
+                threads.append(thread)
+                thread.start()
+
+        finally:
+            for thread in threads:
+                thread.join()
+            sock.close()
 
     @classmethod
     def startResponders(cls):
@@ -837,12 +843,15 @@ class TestDnstapOverFrameStreamTcpLogger(DNSDistTest):
             sys.exit(1)
 
         sock.listen(100)
-        while True:
-            (conn, _) = sock.accept()
-            fstrm_handle_bidir_connection(conn, lambda data: \
-                cls._fstrmLoggerQueue.put(data, True, timeout=2.0))
-            conn.close()
-        sock.close()
+
+        try:
+            while True:
+                (conn, _) = sock.accept()
+                fstrm_handle_bidir_connection(conn, lambda data: \
+                    cls._fstrmLoggerQueue.put(data, True, timeout=2.0))
+                conn.close()
+        finally:
+            sock.close()
 
     @classmethod
     def startResponders(cls):
@@ -922,15 +931,18 @@ class TestDnstapOverRemotePoolTcpLogger(DNSDistTest):
             conn.close()
 
         threads = []
-        while True:
-            (conn, _) = sock.accept()
-            thread = threading.Thread(target=handle_connection, args=[conn])
-            threads.append(thread)
-            thread.start()
 
-        for thread in threads:
-            thread.join()
-        sock.close()
+        try:
+            while True:
+                (conn, _) = sock.accept()
+                thread = threading.Thread(target=handle_connection, args=[conn])
+                threads.append(thread)
+                thread.start()
+
+        finally:
+            for thread in threads:
+                thread.join()
+            sock.close()
 
     @classmethod
     def startResponders(cls):

diff --git a/regression-tests.dnsdist/test_OOOR.py b/regression-tests.dnsdist/test_OOOR.py
index aa9b76af78f36fc0d6116848acae6a04394a5fdb..a554ef19a1e42a1ebf57e6fa43570eb5c34d15af 100644 (file)
--- a/regression-tests.dnsdist/test_OOOR.py
+++ b/regression-tests.dnsdist/test_OOOR.py
@@ -54,18 +54,21 @@ class OOORTCPResponder(object):
             sys.exit(1)
 
         sock.listen(100)
-        while True:
-            (conn, _) = sock.accept()
-            conn.settimeout(5.0)
 
-            OOORTCPResponder.numberOfConnections = OOORTCPResponder.numberOfConnections + 1
-            thread = threading.Thread(name='Connection Handler',
-                                      target=self.handleConnection,
-                                      args=[conn])
-            thread.daemon = True
-            thread.start()
+        try:
+            while True:
+                (conn, _) = sock.accept()
+                conn.settimeout(5.0)
 
-        sock.close()
+                OOORTCPResponder.numberOfConnections = OOORTCPResponder.numberOfConnections + 1
+                thread = threading.Thread(name='Connection Handler',
+                                        target=self.handleConnection,
+                                        args=[conn])
+                thread.daemon = True
+                thread.start()
+
+        finally:
+            sock.close()
 
 class ReverseOOORTCPResponder(OOORTCPResponder):
 
@@ -125,17 +128,20 @@ class ReverseOOORTCPResponder(OOORTCPResponder):
             sys.exit(1)
 
         sock.listen(100)
-        while True:
-            (conn, _) = sock.accept()
 
-            ReverseOOORTCPResponder.numberOfConnections = ReverseOOORTCPResponder.numberOfConnections + 1
-            thread = threading.Thread(name='Connection Handler',
-                                      target=self.handleConnection,
-                                      args=[conn])
-            thread.daemon = True
-            thread.start()
+        try:
+            while True:
+                (conn, _) = sock.accept()
 
-        sock.close()
+                ReverseOOORTCPResponder.numberOfConnections = ReverseOOORTCPResponder.numberOfConnections + 1
+                thread = threading.Thread(name='Connection Handler',
+                                        target=self.handleConnection,
+                                        args=[conn])
+                thread.daemon = True
+                thread.start()
+
+        finally:
+            sock.close()
 
 
 OOORResponderPort = pickAvailablePort()