From 5ca0d4f85635c1395660918d89698ea63bc6139c Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 10 Mar 2022 23:03:27 +0800 Subject: [PATCH] fix(rule): rename the eventname of bridge sources to $bridges/mqtt:* --- apps/emqx_rule_engine/src/emqx_rule_events.erl | 2 +- apps/emqx_rule_engine/src/emqx_rule_sqltester.erl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx_rule_engine/src/emqx_rule_events.erl b/apps/emqx_rule_engine/src/emqx_rule_events.erl index c7da1a17f..1b45ddb0f 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_events.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_events.erl @@ -448,7 +448,7 @@ event_info_session_unsubscribed() -> ). event_info_bridge_mqtt()-> event_info_common( - <<"$bridges/mqtt:my_mqtt_bridge">>, + <<"$bridges/mqtt:*">>, {<<"MQTT bridge message">>, <<"MQTT 桥接消息"/utf8>>}, {<<"received a message from MQTT bridge">>, <<"收到来自 MQTT 桥接的消息"/utf8>>}, <<"SELECT * FROM \"$bridges/mqtt:my_mqtt_bridge\" WHERE topic =~ 't/#'">> diff --git a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl index 8b50a9db2..4f036cf49 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl @@ -84,8 +84,8 @@ echo_action(Data, Envs) -> fill_default_values(Event, Context) -> maps:merge(envs_examp(Event), Context). -envs_examp(EVENT_TOPIC) -> - EventName = emqx_rule_events:event_name(EVENT_TOPIC), +envs_examp(EventTopic) -> + EventName = emqx_rule_events:event_name(EventTopic), emqx_rule_maps:atom_key_map( maps:from_list( emqx_rule_events:columns_with_exam(EventName))).