[1828] Close MsgQ socket in except block

diff --git a/src/bin/msgq/msgq.py.in b/src/bin/msgq/msgq.py.in
index 333ae896d8a5ad677bf52b35e8310cbe06e2bf65..58b1d8722904df0bd2a68661d38f96a9b93696b9 100755 (executable)
--- a/src/bin/msgq/msgq.py.in
+++ b/src/bin/msgq/msgq.py.in
@@ -177,6 +177,7 @@ class MsgQ:
             # (note this is a catch-all, but we reraise it)
             if os.path.exists(self.socket_file):
                 os.remove(self.socket_file)
+            self.listen_socket.close()
             raise e
 
         if self.poller:

diff --git a/src/bin/msgq/tests/msgq_test.py b/src/bin/msgq/tests/msgq_test.py
index 4059ea99ef44b08783e7b6aaa54b9f2a518f7a9f..cc078f41e87399584cfc22ebc0f80dfeab51fb89 100644 (file)
--- a/src/bin/msgq/tests/msgq_test.py
+++ b/src/bin/msgq/tests/msgq_test.py
@@ -111,7 +111,6 @@ class TestSubscriptionManager(unittest.TestCase):
     def test_open_socket_bad(self):
         msgq = MsgQ("/does/not/exist")
         self.assertRaises(socket.error, msgq.setup)
-        msgq.listen_socket.close()
 
 class SendNonblock(unittest.TestCase):
     """