Cleanup

salt/channel/server.py

@@ -774,7 +774,6 @@ class PubServerChannel:
         secrets = kwargs.get("secrets", None)
         if secrets is not None:
             salt.master.SMaster.secrets = secrets
-        log.error("RUN TRANSPORT PUBD")
         self.transport.publish_daemon(
             self.publish_payload, self.presence_callback, self.remove_presence_callback
         )

salt/cli/salt.py

@@ -222,9 +222,8 @@ class SaltCMD(salt.utils.parsers.SaltCMDOptionParser):
             AuthorizationError,
             SaltInvocationError,
             EauthAuthenticationError,
-            # SaltClientError,
+            SaltClientError,
         ) as exc:
-            print(repr(exc))
             ret = str(exc)
             self._output_ret(ret, "", retcode=1)
         finally:

salt/minion.py

@@ -1102,7 +1102,6 @@ class MinionManager(MinionBase):
             self.io_loop.add_callback(
                 ipc_publisher.publisher, ipc_publisher.publish_payload, self.io_loop
             )
-        log.error("get event ")
         self.event = salt.utils.event.get_event(
             "minion", opts=self.opts, io_loop=self.io_loop
         )
@@ -1186,7 +1185,6 @@ class MinionManager(MinionBase):
                     minion.setup_scheduler(before_connect=True)
                 if minion.opts.get("master_type", "str") != "disable":
                     await minion.connect_master(failed=failed)
-                log.error("RUN MINION TUNE IN")
                 minion.tune_in(start=False)
                 self.minions.append(minion)
                 break
@@ -3292,9 +3290,7 @@ class Minion(MinionBase):
         if self._running is False:
             return
 
-        log.error("Loop status %r %r", self, self.io_loop.asyncio_loop.is_running())
         self.io_loop.asyncio_loop.stop()
-        log.error("Loop status %r %r", self, self.io_loop.asyncio_loop.is_running())
         self._running = False
         if hasattr(self, "schedule"):
             del self.schedule

salt/transport/tcp.py

@@ -702,9 +702,6 @@ class MessageClient:
         source_ip=None,
         source_port=None,
     ):
-        # import traceback
-        # stack = "".join(traceback.format_stack())
-        # print(stack)
         self.opts = opts
         self.host = host
         self.port = port
@@ -732,9 +729,6 @@ class MessageClient:
 
         self.backoff = opts.get("tcp_reconnect_backoff", 1)
         self.callbacks = {}
-        import traceback
-
-        self.stack = "".join(traceback.format_stack())
         self.unpacker = salt.utils.msgpack.Unpacker()
         self._read_in_progress = Lock()
         self.task = None
@@ -1340,11 +1334,6 @@ class TCPPublishServer(salt.transport.base.DaemonizedPublishServer):
             self.pub_sock = None
 
 
-import tracemalloc
-
-tracemalloc.start()
-
-
 class TCPReqClient(salt.transport.base.RequestClient):
     """
     Tornado based TCP RequestClient