Ensure configured logger severity is respected (#35749)
This commit is contained in:
1 parent
d21cfd869e
commit
2c7eee6722
2 files changed
+113
-95
No files matched your search
@@ -1,6 +1,6 @@
|
||||
"""Support for setting the level of logging for components."""
|
||||
from collections import OrderedDict
|
||||
import logging
|
||||
import re
|
||||
|
||||
import voluptuous as vol
|
||||
|
||||
@@ -50,33 +50,54 @@ CONFIG_SCHEMA = vol.Schema(
|
||||
class HomeAssistantLogFilter(logging.Filter):
|
||||
"""A log filter."""
|
||||
|
||||
def __init__(self, logfilter):
|
||||
def __init__(self):
|
||||
"""Initialize the filter."""
|
||||
super().__init__()
|
||||
|
||||
self.logfilter = logfilter
|
||||
self._default = None
|
||||
self._logs = None
|
||||
self._log_rx = None
|
||||
|
||||
def update_default_level(self, default_level):
|
||||
"""Update the default logger level."""
|
||||
self._default = default_level
|
||||
|
||||
def update_log_filter(self, logs):
|
||||
"""Rebuild the internal filter from new config."""
|
||||
#
|
||||
# A precompiled regex is used to avoid
|
||||
# the overhead of a list transversal
|
||||
#
|
||||
# Sort to make sure the longer
|
||||
# names are always matched first
|
||||
# so they take precedence of the shorter names
|
||||
# to allow for more granular settings.
|
||||
#
|
||||
names_by_len = sorted(list(logs), key=len, reverse=True)
|
||||
self._log_rx = re.compile("".join(["^(?:", "|".join(names_by_len), ")"]))
|
||||
self._logs = logs
|
||||
|
||||
def filter(self, record):
|
||||
"""Filter the log entries."""
|
||||
# Log with filtered severity
|
||||
if LOGGER_LOGS in self.logfilter:
|
||||
for filtername in self.logfilter[LOGGER_LOGS]:
|
||||
logseverity = self.logfilter[LOGGER_LOGS][filtername]
|
||||
if record.name.startswith(filtername):
|
||||
return record.levelno >= logseverity
|
||||
if self._log_rx:
|
||||
match = self._log_rx.match(record.name)
|
||||
if match:
|
||||
return record.levelno >= self._logs[match.group(0)]
|
||||
|
||||
# Log with default severity
|
||||
default = self.logfilter[LOGGER_DEFAULT]
|
||||
return record.levelno >= default
|
||||
return record.levelno >= self._default
|
||||
|
||||
|
||||
async def async_setup(hass, config):
|
||||
"""Set up the logger component."""
|
||||
logfilter = {}
|
||||
hass_filter = HomeAssistantLogFilter()
|
||||
|
||||
def set_default_log_level(level):
|
||||
"""Set the default log level for components."""
|
||||
logfilter[LOGGER_DEFAULT] = LOGSEVERITY[level]
|
||||
hass_filter.update_default_level(LOGSEVERITY[level])
|
||||
|
||||
def set_log_levels(logpoints):
|
||||
"""Set the specified log levels."""
|
||||
@@ -90,9 +111,9 @@ async def async_setup(hass, config):
|
||||
for key, value in logpoints.items():
|
||||
logs[key] = LOGSEVERITY[value]
|
||||
|
||||
logfilter[LOGGER_LOGS] = OrderedDict(
|
||||
sorted(logs.items(), key=lambda t: len(t[0]), reverse=True)
|
||||
)
|
||||
logfilter[LOGGER_LOGS] = logs
|
||||
|
||||
hass_filter.update_log_filter(logs)
|
||||
|
||||
# Set default log severity
|
||||
if LOGGER_DEFAULT in config.get(DOMAIN):
|
||||
@@ -106,7 +127,7 @@ async def async_setup(hass, config):
|
||||
# Set log filter for all log handler
|
||||
for handler in logging.root.handlers:
|
||||
handler.setLevel(logging.NOTSET)
|
||||
handler.addFilter(HomeAssistantLogFilter(logfilter))
|
||||
handler.addFilter(hass_filter)
|
||||
|
||||
if LOGGER_LOGS in config.get(DOMAIN):
|
||||
set_log_levels(config.get(DOMAIN)[LOGGER_LOGS])
|
||||
|
||||
Reference in new issue
Block a user