mirror of
https://github.com/esphome/esphome.git
synced 2025-03-16 15:48:16 +00:00
Add logger.log Action
This commit is contained in:
parent
25c66ed8ca
commit
245bd48930
@ -1,10 +1,12 @@
|
|||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
|
from esphomeyaml.automation import ACTION_REGISTRY, LambdaAction
|
||||||
import esphomeyaml.config_validation as cv
|
import esphomeyaml.config_validation as cv
|
||||||
from esphomeyaml.const import CONF_BAUD_RATE, CONF_ID, CONF_LEVEL, CONF_LOGS, \
|
from esphomeyaml.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_ID, CONF_LEVEL, \
|
||||||
CONF_TX_BUFFER_SIZE
|
CONF_LOGS, CONF_TAG, CONF_TX_BUFFER_SIZE
|
||||||
from esphomeyaml.core import ESPHomeYAMLError
|
from esphomeyaml.core import ESPHomeYAMLError, Lambda
|
||||||
from esphomeyaml.helpers import App, Pvariable, add, esphomelib_ns, global_ns
|
from esphomeyaml.helpers import App, Pvariable, TemplateArguments, add, esphomelib_ns, global_ns, \
|
||||||
|
process_lambda, RawExpression, statement
|
||||||
|
|
||||||
LOG_LEVELS = {
|
LOG_LEVELS = {
|
||||||
'NONE': global_ns.ESPHOMELIB_LOG_LEVEL_NONE,
|
'NONE': global_ns.ESPHOMELIB_LOG_LEVEL_NONE,
|
||||||
@ -16,6 +18,15 @@ LOG_LEVELS = {
|
|||||||
'VERY_VERBOSE': global_ns.ESPHOMELIB_LOG_LEVEL_VERY_VERBOSE,
|
'VERY_VERBOSE': global_ns.ESPHOMELIB_LOG_LEVEL_VERY_VERBOSE,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOG_LEVEL_TO_ESP_LOG = {
|
||||||
|
'ERROR': global_ns.ESP_LOGE,
|
||||||
|
'WARN': global_ns.ESP_LOGW,
|
||||||
|
'INFO': global_ns.ESP_LOGI,
|
||||||
|
'DEBUG': global_ns.ESP_LOGD,
|
||||||
|
'VERBOSE': global_ns.ESP_LOGV,
|
||||||
|
'VERY_VERBOSE': global_ns.ESP_LOGVV,
|
||||||
|
}
|
||||||
|
|
||||||
LOG_LEVEL_SEVERITY = ['NONE', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'VERBOSE', 'VERY_VERBOSE']
|
LOG_LEVEL_SEVERITY = ['NONE', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'VERBOSE', 'VERY_VERBOSE']
|
||||||
|
|
||||||
# pylint: disable=invalid-name
|
# pylint: disable=invalid-name
|
||||||
@ -59,3 +70,27 @@ def required_build_flags(config):
|
|||||||
if CONF_LEVEL in config:
|
if CONF_LEVEL in config:
|
||||||
return u'-DESPHOMELIB_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]]))
|
return u'-DESPHOMELIB_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]]))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
CONF_LOGGER_LOG = 'logger.log'
|
||||||
|
LOGGER_LOG_ACTION_SCHEMA = vol.Schema({
|
||||||
|
vol.Required(CONF_FORMAT): cv.string,
|
||||||
|
vol.Optional(CONF_ARGS, default=list): vol.All(cv.ensure_list, [cv.lambda_]),
|
||||||
|
vol.Optional(CONF_LEVEL, default="DEBUG"): vol.All(vol.Upper, cv.one_of(*LOG_LEVEL_TO_ESP_LOG)),
|
||||||
|
vol.Optional(CONF_TAG, default="main"): cv.string,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ACTION_REGISTRY.register(CONF_LOGGER_LOG, LOGGER_LOG_ACTION_SCHEMA)
|
||||||
|
def logger_log_action_to_code(config, action_id, arg_type):
|
||||||
|
template_arg = TemplateArguments(arg_type)
|
||||||
|
esp_log = LOG_LEVEL_TO_ESP_LOG[config[CONF_LEVEL]]
|
||||||
|
args = [RawExpression(unicode(x)) for x in config[CONF_ARGS]]
|
||||||
|
|
||||||
|
text = unicode(statement(esp_log(config[CONF_TAG], config[CONF_FORMAT], *args)))
|
||||||
|
|
||||||
|
for lambda_ in process_lambda(Lambda(text), [(arg_type, 'x')]):
|
||||||
|
yield None
|
||||||
|
rhs = LambdaAction.new(template_arg, lambda_)
|
||||||
|
type = LambdaAction.template(template_arg)
|
||||||
|
yield Pvariable(action_id, rhs, type=type)
|
||||||
|
@ -346,6 +346,8 @@ CONF_PM_2_5 = 'pm_2_5'
|
|||||||
CONF_PM_10_0 = 'pm_10_0'
|
CONF_PM_10_0 = 'pm_10_0'
|
||||||
CONF_FORMALDEHYDE = 'formaldehyde'
|
CONF_FORMALDEHYDE = 'formaldehyde'
|
||||||
CONF_ON_TAG = 'on_tag'
|
CONF_ON_TAG = 'on_tag'
|
||||||
|
CONF_ARGS = 'args'
|
||||||
|
CONF_FORMAT = 'format'
|
||||||
CONF_COLOR_CORRECT = 'color_correct'
|
CONF_COLOR_CORRECT = 'color_correct'
|
||||||
CONF_ON_JSON_MESSAGE = 'on_json_message'
|
CONF_ON_JSON_MESSAGE = 'on_json_message'
|
||||||
|
|
||||||
|
@ -193,6 +193,10 @@ sensor:
|
|||||||
on_raw_value:
|
on_raw_value:
|
||||||
- lambda: >-
|
- lambda: >-
|
||||||
ESP_LOGD("main", "Got raw value %f", x);
|
ESP_LOGD("main", "Got raw value %f", x);
|
||||||
|
- logger.log:
|
||||||
|
level: DEBUG
|
||||||
|
format: "Got raw value %f"
|
||||||
|
args: ['x']
|
||||||
- mqtt.publish:
|
- mqtt.publish:
|
||||||
topic: some/topic
|
topic: some/topic
|
||||||
payload: Hello
|
payload: Hello
|
||||||
|
Loading…
x
Reference in New Issue
Block a user