diff --git a/changelog/68943.fixed.md b/changelog/68943.fixed.md new file mode 100644 index 000000000000..472ca64c5457 --- /dev/null +++ b/changelog/68943.fixed.md @@ -0,0 +1 @@ +Fixed typos in log messages: "occured" → "occurred" and "recieve" → "receive" in salt/crypt.py, salt/cli/daemons.py, salt/metaproxy/deltaproxy.py, salt/minion.py, and salt/transport/zeromq.py. diff --git a/salt/cli/daemons.py b/salt/cli/daemons.py index 9e2124cb8f7b..0a1fab40f3cc 100644 --- a/salt/cli/daemons.py +++ b/salt/cli/daemons.py @@ -333,7 +333,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 db900a164fd8..333687d0d7f3 100644 --- a/salt/crypt.py +++ b/salt/crypt.py @@ -1487,7 +1487,9 @@ 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 cb2b8e2c9a09..d8d5f4ad7ccf 100644 --- a/salt/metaproxy/deltaproxy.py +++ b/salt/metaproxy/deltaproxy.py @@ -385,7 +385,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, ) @@ -526,7 +526,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 81c828dec5d0..d8dcea878bef 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -2110,7 +2110,7 @@ async def _send_req_async(self, load, timeout): break await asyncio.sleep(0.3) else: - raise SaltReqTimeoutError("Did not recieve return event") + raise SaltReqTimeoutError("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 84046009b70e..4a972bf522ed 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -391,7 +391,7 @@ async def recv(self, timeout=None): events = await self._socket.poll(timeout=int(timeout * 1000)) if events: return await self._socket.recv() - log.trace("PublishClient recieve timedout: %s", timeout) + log.trace("PublishClient receive timedout: %s", timeout) else: return await self._socket.recv()