diff --git a/salt/cli/daemons.py b/salt/cli/daemons.py index a791e81f6dd6..0b7fdc2e69ab 100644 --- a/salt/cli/daemons.py +++ b/salt/cli/daemons.py @@ -327,7 +327,7 @@ def prepare(self): self.minion = salt.minion.MinionManager(self.config) except Exception: # pylint: disable=broad-except log.error( - "An error occured while setting up the minion manager", exc_info=True + "An error occurred while setting up the minion manager", exc_info=True ) self.shutdown(1) diff --git a/salt/crypt.py b/salt/crypt.py index ce8c9983d968..2da3314ba024 100644 --- a/salt/crypt.py +++ b/salt/crypt.py @@ -1255,7 +1255,7 @@ def decrypt_aes(self, payload, master_pub=True): try: mkey = PublicKey.from_file(m_path) except Exception: # pylint: disable=broad-except - log.exception("Something unexpected occured loading master pub-key") + log.exception("Something unexpected occurred loading master pub-key") return "", "" digest = hashlib.sha256(key_str).hexdigest() digest = salt.utils.stringutils.to_bytes(digest) diff --git a/salt/metaproxy/deltaproxy.py b/salt/metaproxy/deltaproxy.py index 5d9cc8ac18d7..2c0391643645 100644 --- a/salt/metaproxy/deltaproxy.py +++ b/salt/metaproxy/deltaproxy.py @@ -388,7 +388,7 @@ async def post_master_init(self, master): ) except Exception as exc: # pylint: disable=broad-except log.info( - "An exception occured during initialization for %s, skipping: %s", + "An exception occurred during initialization for %s, skipping: %s", _id, exc, ) @@ -529,7 +529,7 @@ async def subproxy_post_master_init(minion_id, uid, opts, main_proxy, main_utils proxy_init_fn(proxyopts) except Exception as exc: # pylint: disable=broad-except log.error( - "An exception occured during the initialization of minion %s: %s", + "An exception occurred during the initialization of minion %s: %s", minion_id, exc, exc_info=True, diff --git a/salt/minion.py b/salt/minion.py index 45e326949398..6fd416b215a1 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -1795,7 +1795,7 @@ async def _send_req_async(self, load, timeout): break await asyncio.sleep(0.3) else: - raise TimeoutError("Did not recieve return event") + raise TimeoutError("Did not receive return event") log.trace("Reply from main %s", request_id) return ret["ret"] diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index 65c165c897a2..fd6a6e8171f9 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -337,7 +337,7 @@ async def recv(self, timeout=None): try: return await asyncio.wait_for(self._socket.recv(), timeout=timeout) except asyncio.exceptions.TimeoutError: - log.trace("PublishClient recieve timedout: %d", timeout) + log.trace("PublishClient receive timedout: %d", timeout) else: return await self._socket.recv()