jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-15 09:17:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pull request from balloob comments

Browse Source
This commit is contained in:
badele 2015-11-06 22:51:33 +01:00
parent a31f7d2816
commit aeacbad4a0
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/logger.py
View File

@ -17,6 +17,7 @@ logger:
""" """
import logging import logging
from collections import OrderedDict
DOMAIN = 'logger' DOMAIN = 'logger'
DEPENDENCIES = [] DEPENDENCIES = []
@ -49,9 +50,8 @@ class HomeAssistantLogFilter(logging.Filter):
# Log with filterd severity # Log with filterd severity
if LOGGER_LOGS in self.logfilter: if LOGGER_LOGS in self.logfilter:
for keyvalue in self.logfilter[LOGGER_LOGS]: for filtername in self.logfilter[LOGGER_LOGS]:
filtername = keyvalue[0] logseverity = self.logfilter[LOGGER_LOGS][filtername]
logseverity = keyvalue[1]
if record.name.startswith(filtername): if record.name.startswith(filtername):
return record.levelno >= logseverity return record.levelno >= logseverity
@ -63,33 +63,32 @@ class HomeAssistantLogFilter(logging.Filter):
def setup(hass, config=None): def setup(hass, config=None):
""" Setup the logger component. """ """ Setup the logger component. """
root_logger = logging.getLogger()
loggerconfig = config.get(DOMAIN)
logfilter = dict() logfilter = dict()
# Set default log severity # Set default log severity
logfilter[LOGGER_DEFAULT] = LOGSEVERITY['debug'.upper()] logfilter[LOGGER_DEFAULT] = LOGSEVERITY['DEBUG']
if LOGGER_DEFAULT in loggerconfig: if LOGGER_DEFAULT in config.get(DOMAIN):
logfilter[LOGGER_DEFAULT] = LOGSEVERITY[ logfilter[LOGGER_DEFAULT] = LOGSEVERITY[
loggerconfig[LOGGER_DEFAULT].upper() config.get(DOMAIN)[LOGGER_DEFAULT].upper()
] ]
# Compute logseverity for components # Compute logseverity for components
if LOGGER_LOGS in loggerconfig: if LOGGER_LOGS in config.get(DOMAIN):
for key, value in loggerconfig[LOGGER_LOGS].items(): for key, value in config.get(DOMAIN)[LOGGER_LOGS].items():
loggerconfig[LOGGER_LOGS][key] = LOGSEVERITY[value.upper()] config.get(DOMAIN)[LOGGER_LOGS][key] = LOGSEVERITY[value.upper()]
logs = sorted( logs = OrderedDict(
loggerconfig[LOGGER_LOGS].items(), sorted(
key=lambda t: t[0], config.get(DOMAIN)[LOGGER_LOGS].items(),
key=lambda t: len(t[0]),
reverse=True reverse=True
) )
)
logfilter[LOGGER_LOGS] = logs logfilter[LOGGER_LOGS] = logs
# Set log filter for all log handler # Set log filter for all log handler
for handler in logging.root.handlers: for handler in logging.root.handlers:
handler.addFilter(HomeAssistantLogFilter(logfilter)) handler.addFilter(HomeAssistantLogFilter(logfilter))
root_logger.info(logfilter)
return True return True