yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fallback action not triggered when send to webhook failed

This commit is contained in:
Shawn 2022-06-24 14:34:40 +08:00
parent 7a3941ce5d
commit 0a99e835e7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_rule_engine/src/emqx_rule_actions.erl
View File

@ -175,7 +175,8 @@ on_action_republish(_Selected, Envs = #{
}) -> }) ->
?LOG(error, "[republish] recursively republish detected, msg topic: ~p, target topic: ~p", ?LOG(error, "[republish] recursively republish detected, msg topic: ~p, target topic: ~p",
[Topic, ?bound_v('TargetTopic', Envs)]), [Topic, ?bound_v('TargetTopic', Envs)]),
emqx_rule_metrics:inc_actions_error(?bound_v('Id', Envs)); emqx_rule_metrics:inc_actions_error(?bound_v('Id', Envs)),
{badact, recursively_republish};
on_action_republish(Selected, _Envs = #{ on_action_republish(Selected, _Envs = #{
qos := QoS, flags := Flags, timestamp := Timestamp, qos := QoS, flags := Flags, timestamp := Timestamp,

9
apps/emqx_web_hook/src/emqx_web_hook_actions.erl
View File

@ -268,13 +268,16 @@ on_action_data_to_webserver(Selected, _Envs =
emqx_rule_metrics:inc_actions_success(Id); emqx_rule_metrics:inc_actions_success(Id);
{ok, StatusCode, _} -> {ok, StatusCode, _} ->
?LOG(warning, "HTTP request failed with path: ~p status code: ~p", [NPath, StatusCode]), ?LOG(warning, "HTTP request failed with path: ~p status code: ~p", [NPath, StatusCode]),
emqx_rule_metrics:inc_actions_error(Id); emqx_rule_metrics:inc_actions_error(Id),
{badact, StatusCode};
{ok, StatusCode, _, _} -> {ok, StatusCode, _, _} ->
?LOG(warning, "HTTP request failed with path: ~p status code: ~p", [NPath, StatusCode]), ?LOG(warning, "HTTP request failed with path: ~p status code: ~p", [NPath, StatusCode]),
emqx_rule_metrics:inc_actions_error(Id); emqx_rule_metrics:inc_actions_error(Id),
{badact, StatusCode};
{error, Reason} -> {error, Reason} ->
?LOG(error, "HTTP request failed path: ~p error: ~p", [NPath, Reason]), ?LOG(error, "HTTP request failed path: ~p error: ~p", [NPath, Reason]),
emqx_rule_metrics:inc_actions_error(Id) emqx_rule_metrics:inc_actions_error(Id),
{badact, Reason}
end. end.
format_msg([], Data) -> format_msg([], Data) ->