Skip to content

Commit

Permalink
Fix up log levels
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Jan 23, 2025
1 parent a5ae7bd commit b01f7d4
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions salt/minion.py
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,6 @@ def _bind(self):

@salt.ext.tornado.gen.coroutine
def handle_event(self, package):
log.error("Dispatch event to minions")
try:
yield [_.handle_event(package) for _ in self.minions]
except Exception as exc: # pylint: disable=broad-except
Expand Down Expand Up @@ -1635,7 +1634,7 @@ def _send_req_sync(self, load, timeout):
load["sig"] = sig
with salt.utils.event.get_event("minion", opts=self.opts, listen=True) as event:
request_id = str(uuid.uuid4())
log.debug("Send request to main id=%s", request_id)
log.trace("Send request to main id=%s", request_id)
event.fire_event(
load,
f"__master_req_channel_payload/{request_id}/{self.opts['master']}",
Expand All @@ -1661,10 +1660,7 @@ def _send_req_async(self, load, timeout):
load["sig"] = sig
with salt.utils.event.get_event("minion", opts=self.opts, listen=True) as event:
request_id = str(uuid.uuid4())
log.debug(
"Sending req to main thread. id=%s",
request_id,
)
log.trace("Send request to main id=%s", request_id)
yield event.fire_event_async(
load,
f"__master_req_channel_payload/{request_id}/{self.opts['master']}",
Expand All @@ -1680,7 +1676,7 @@ def _send_req_async(self, load, timeout):
yield salt.ext.tornado.gen.sleep(0.3)
else:
raise TimeoutError("Did not recieve return event")
log.debug("Recieved request reply %s %r", request_id, ret)
log.trace("Reply from main %s", request_id)
raise salt.ext.tornado.gen.Return(ret["ret"])

@salt.ext.tornado.gen.coroutine
Expand Down

0 comments on commit b01f7d4

Please sign in to comment.