Remove un-needed method

saltstack · Sep 15, 2021 · d5a16a1 · d5a16a1
1 parent 7af10f2
commit d5a16a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/salt/scripts.py b/salt/scripts.py
@@ -446,15 +446,11 @@ def salt_call():
     except ImportError:
         zeromq = None
 
-    try:
-        if "" in sys.path:
-            sys.path.remove("")
-        client = salt.cli.call.SaltCall()
-        _install_signal_handlers(client)
-        client.run()
-    finally:
-        if zeromq is not None:
-            zeromq.AsyncZeroMQReqChannel.force_close_all_instances()
+    if "" in sys.path:
+        sys.path.remove("")
+    client = salt.cli.call.SaltCall()
+    _install_signal_handlers(client)
+    client.run()
 
 
 def salt_run():

diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
@@ -213,13 +213,6 @@ class AsyncTCPReqChannel(salt.transport.client.ReqChannel):
 
 
     @classmethod
-    def force_close_all_instances(cls):
-        """
-        Will force close all instances
-        :return: None
-        """
-        pass
-
     def __init__(self, opts, **kwargs):
         self.opts = dict(opts)
 

diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
@@ -138,18 +138,6 @@ class AsyncZeroMQReqChannel(salt.transport.client.ReqChannel):
         "close",
     ]
 
-    @classmethod
-    def force_close_all_instances(cls):
-        """
-        Will force close all instances
-
-        ZMQ can hang on quit if left to deconstruct on its own.
-        This because is deconstructs out of order.
-
-        :return: None
-        """
-        pass
-
     def __init__(self, opts, **kwargs):
         self.opts = dict(opts)
         self.ttype = "zeromq"