saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Getting nightly builds running again for 3006.x

Browse source
This commit is contained in:
David Murphy 2025-02-25 11:47:48 -07:00 • committed by Daniel Wozniak
parent 5e19e2db18
commit c16232efad
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
salt/_logging/impl.py
View file

@ -280,16 +280,29 @@ class SaltLoggingClass(LOGGING_LOGGER_CLASS, metaclass=LoggingMixinMeta):
else: else:
extra["exc_info_on_loglevel"] = exc_info_on_loglevel extra["exc_info_on_loglevel"] = exc_info_on_loglevel
LOGGING_LOGGER_CLASS._log( try:
self, LOGGING_LOGGER_CLASS._log(
level, self,
msg, level,
args, msg,
exc_info=exc_info, args,
extra=extra, exc_info=exc_info,
stack_info=stack_info, extra=extra,
stacklevel=stacklevel, stack_info=stack_info,
) stacklevel=stacklevel,
)
except TypeError:
# stacklevel was introduced in Py 3.8
# must be running on old OS with Python 3.6 or 3.7
LOGGING_LOGGER_CLASS._log(
self,
level,
msg,
args,
exc_info=exc_info,
extra=extra,
stack_info=stack_info,
)
def makeRecord( def makeRecord(
self, self,