Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/cli/daemons.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion salt/crypt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions salt/metaproxy/deltaproxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion salt/minion.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
2 changes: 1 addition & 1 deletion salt/transport/zeromq.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down