evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix logger config validation (#3459)

Browse source
This commit is contained in:
Paulus Schoutsen 2016-09-19 21:12:56 -07:00 • committed by GitHub
parent fa2ce366de
commit 9ac39df33f
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/components/logger.py
View file

@ -27,14 +27,12 @@ LOGSEVERITY = {
LOGGER_DEFAULT = 'default'
LOGGER_LOGS = 'logs'
_LOGS_SCHEMA = vol.Schema({
cv.string: vol.In(vol.Lower(list(LOGSEVERITY))),
})
_VALID_LOG_LEVEL = vol.All(vol.Upper, vol.In(LOGSEVERITY))
CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({
vol.Required(LOGGER_DEFAULT): vol.In(vol.Lower(list(LOGSEVERITY))),
vol.Required(LOGGER_LOGS): _LOGS_SCHEMA,
vol.Optional(LOGGER_DEFAULT): _VALID_LOG_LEVEL,
vol.Optional(LOGGER_LOGS): vol.Schema({cv.string: _VALID_LOG_LEVEL}),
}),
}, extra=vol.ALLOW_EXTRA)
@ -65,19 +63,19 @@ class HomeAssistantLogFilter(logging.Filter):
def setup(hass, config=None):
"""Setup the logger component."""
logfilter = dict()
logfilter = {}
# Set default log severity
logfilter[LOGGER_DEFAULT] = LOGSEVERITY['DEBUG']
if LOGGER_DEFAULT in config.get(DOMAIN):
logfilter[LOGGER_DEFAULT] = LOGSEVERITY[
config.get(DOMAIN)[LOGGER_DEFAULT].upper()
config.get(DOMAIN)[LOGGER_DEFAULT]
]
# Compute log severity for components
if LOGGER_LOGS in config.get(DOMAIN):
for key, value in config.get(DOMAIN)[LOGGER_LOGS].items():
config.get(DOMAIN)[LOGGER_LOGS][key] = LOGSEVERITY[value.upper()]
config.get(DOMAIN)[LOGGER_LOGS][key] = LOGSEVERITY[value]
logs = OrderedDict(
sorted(