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

Merge pull request #10338 from SergeTupchiy/refactor-rule-engine-runtime-ok-result 

refactor(rule_engine): test 'ok' results in one dedicated function
This commit is contained in:
SergeTupchiy 2023-04-05 22:40:40 +03:00 committed by GitHub
parent f3446c48f7 9810c9f7e3
commit 0a73866d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_rule_engine/src/emqx_rule_runtime.erl
View File

@ -508,8 +508,6 @@ nested_put(Alias, Val, Columns0) ->
emqx_rule_maps:nested_put(Alias, Val, Columns). emqx_rule_maps:nested_put(Alias, Val, Columns).
-define(IS_RES_DOWN(R), R == stopped; R == not_connected; R == not_found). -define(IS_RES_DOWN(R), R == stopped; R == not_connected; R == not_found).
inc_action_metrics(ok, RuleId) ->
emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.success');
inc_action_metrics({error, {recoverable_error, _}}, RuleId) -> inc_action_metrics({error, {recoverable_error, _}}, RuleId) ->
emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'); emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service');
inc_action_metrics(?RESOURCE_ERROR_M(R, _), RuleId) when ?IS_RES_DOWN(R) -> inc_action_metrics(?RESOURCE_ERROR_M(R, _), RuleId) when ?IS_RES_DOWN(R) ->
@ -525,6 +523,8 @@ inc_action_metrics(R, RuleId) ->
emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.success') emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.success')
end. end.
is_ok_result(ok) ->
true;
is_ok_result(R) when is_tuple(R) -> is_ok_result(R) when is_tuple(R) ->
ok == erlang:element(1, R); ok == erlang:element(1, R);
is_ok_result(_) -> is_ok_result(_) ->