Merge pull request #5165 from s0undt3ch/develop

Don't try to get the `_fmt` attribute if there's no formatter.
2024-11-09 01:36:48 +00:00 · 2013-05-21 01:50:49 -07:00 · 2013-05-21 01:50:49 -07:00 · 7eaee6d9a0
commit 7eaee6d9a0
parent 5982e79a68 b0705c3010
1 changed files with 3 additions and 0 deletions
--- a/salt/log.py
+++ b/salt/log.py
@ -166,6 +166,9 @@ class SaltLoggingClass(LOGGING_LOGGER_CLASS):
                handler.acquire()

                formatter = handler.formatter
+                if not formatter:
+                    continue
+
                fmt = formatter._fmt.replace('%', '%%')

                match = MODNAME_PATTERN.search(fmt)