From 5ad05c61cf7d001e42d7a53bfeb42496e5d384ff Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 19 May 2023 00:29:54 -0700 Subject: [PATCH] Fix up based on PR reviews --- salt/metaproxy/deltaproxy.py | 6 +++--- salt/metaproxy/proxy.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/metaproxy/deltaproxy.py b/salt/metaproxy/deltaproxy.py index a9a7fa50a18..223b611e959 100644 --- a/salt/metaproxy/deltaproxy.py +++ b/salt/metaproxy/deltaproxy.py @@ -11,8 +11,8 @@ import threading import traceback import types -import tornado.gen # pylint: disable=F0401 -import tornado.ioloop # pylint: disable=F0401 +import tornado.gen +import tornado.ioloop import salt import salt._logging @@ -355,7 +355,7 @@ def post_master_init(self, master): try: results = yield tornado.gen.multi(waitfor) except Exception as exc: # pylint: disable=broad-except - log.error("Errors loading sub proxies") + log.error("Errors loading sub proxies: %s", exc) _failed = self.opts["proxy"].get("ids", [])[:] for sub_proxy_data in results: diff --git a/salt/metaproxy/proxy.py b/salt/metaproxy/proxy.py index ace2260cf62..c83fb8f959c 100644 --- a/salt/metaproxy/proxy.py +++ b/salt/metaproxy/proxy.py @@ -9,8 +9,8 @@ import threading import traceback import types -import tornado.gen # pylint: disable=F0401 -import tornado.ioloop # pylint: disable=F0401 +import tornado.gen +import tornado.ioloop import salt import salt.beacons