Commit 8c9182a704bbe0ea30ca9d79f0b664cd58bc9638
Committed by
Christian Herdtweck
1 parent
ffc71fcb
log_helper: always use get_or_create_silent_logger
Oletools always use the NullHandler and a high log level, so there's no need for an extra function.
Showing
1 changed file
with
1 additions
and
10 deletions
oletools/util/log_helper/log_helper.py
| @@ -69,14 +69,6 @@ class LogHelper: | @@ -69,14 +69,6 @@ class LogHelper: | ||
| 69 | self._json_formatter = JsonFormatter() | 69 | self._json_formatter = JsonFormatter() |
| 70 | logging.setLoggerClass(OletoolsLogger) | 70 | logging.setLoggerClass(OletoolsLogger) |
| 71 | 71 | ||
| 72 | - def get_or_create_logger(self, name=DEFAULT_LOGGER_NAME, level=logging.WARNING): | ||
| 73 | - """ | ||
| 74 | - Get a logger or create one if it doesn't exist. | ||
| 75 | - To keep the same behavior as `logging.getLogger`, we add a StreamHandler | ||
| 76 | - that logs by default to stderr | ||
| 77 | - """ | ||
| 78 | - return self._get_or_create_logger(name, level, logging.StreamHandler()) | ||
| 79 | - | ||
| 80 | def get_or_create_silent_logger(self, name=DEFAULT_LOGGER_NAME, level=logging.CRITICAL + 1): | 72 | def get_or_create_silent_logger(self, name=DEFAULT_LOGGER_NAME, level=logging.CRITICAL + 1): |
| 81 | """ | 73 | """ |
| 82 | Get a logger or create one if it doesn't exist, setting a NullHandler | 74 | Get a logger or create one if it doesn't exist, setting a NullHandler |
| @@ -105,8 +97,7 @@ class LogHelper: | @@ -105,8 +97,7 @@ class LogHelper: | ||
| 105 | # and set their formatters to our custom Json formatter | 97 | # and set their formatters to our custom Json formatter |
| 106 | # also set their levels so they respect what the main module wants logged | 98 | # also set their levels so they respect what the main module wants logged |
| 107 | for name in self._all_names: | 99 | for name in self._all_names: |
| 108 | - logger = self.get_or_create_logger(name) | ||
| 109 | - logger.setLevel(log_level) | 100 | + logger = self.get_or_create_silent_logger(name) |
| 110 | 101 | ||
| 111 | if self._use_json: | 102 | if self._use_json: |
| 112 | self._make_json(logger) | 103 | self._make_json(logger) |