From c16232efadd6eae2ca3ffd91e754d04fcb2fba62 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Tue, 25 Feb 2025 11:47:48 -0700 Subject: [PATCH] Getting nightly builds running again for 3006.x --- salt/_logging/impl.py | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/salt/_logging/impl.py b/salt/_logging/impl.py index e24fecced4d..77ef47ff735 100644 --- a/salt/_logging/impl.py +++ b/salt/_logging/impl.py @@ -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,