Getting nightly builds running again for 3006.x

This commit is contained in:
David Murphy 2025-02-25 11:47:48 -07:00 committed by Daniel Wozniak
parent 5e19e2db18
commit c16232efad

View file

@ -280,16 +280,29 @@ class SaltLoggingClass(LOGGING_LOGGER_CLASS, metaclass=LoggingMixinMeta):
else:
extra["exc_info_on_loglevel"] = exc_info_on_loglevel
LOGGING_LOGGER_CLASS._log(
self,
level,
msg,
args,
exc_info=exc_info,
extra=extra,
stack_info=stack_info,
stacklevel=stacklevel,
)
try:
LOGGING_LOGGER_CLASS._log(
self,
level,
msg,
args,
exc_info=exc_info,
extra=extra,
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(
self,