Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: make init_resource_with_retrier/4 only 'throw' when failed #9334

Merged
merged 1 commit into from
Nov 10, 2022
Merged

fix: make init_resource_with_retrier/4 only 'throw' when failed #9334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions apps/emqx_rule_engine/src/emqx_rule_engine.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,15 @@
%% redefine this macro to confine the appup scope
-undef(RAISE).
-define(RAISE(_EXP_, _ERROR_CONTEXT_),
?RAISE(_EXP_, do_nothing, _ERROR_CONTEXT_)).
-define(RAISE(_EXP_, _EXP_ON_FAIL_, _ERROR_CONTEXT_),
fun() ->
try (_EXP_)
catch
throw : Reason ->
throw({_ERROR_CONTEXT_, Reason});
_EXCLASS_:_EXCPTION_:_ST_ ->
_EXP_ON_FAIL_,
throw({_ERROR_CONTEXT_, {_EXCLASS_, _EXCPTION_, _ST_}})
end
end()).
Expand Down Expand Up @@ -496,7 +499,12 @@ refresh_resource(Type) when is_atom(Type) ->
refresh_resource(#resource{id = ResId, type = Type, config = Config}) ->
{ok, #resource_type{on_create = {M, F}}} =
emqx_rule_registry:find_resource_type(Type),
ok = emqx_rule_engine:init_resource_with_retrier(M, F, ResId, Config).
try
init_resource_with_retrier(M, F, ResId, Config)
catch
throw:Reason ->
?LOG_SENSITIVE(warning, "refresh_resource failed: ~0p", [Reason])
end.

-spec(refresh_rules_when_boot() -> ok).
refresh_rules_when_boot() ->
Expand Down Expand Up @@ -675,16 +683,12 @@ init_resource(Module, OnCreate, ResId, Config) ->
emqx_rule_registry:add_resource_params(ResParams).

init_resource_with_retrier(Module, OnCreate, ResId, Config) ->
try
Params = Module:OnCreate(ResId, Config),
ResParams = #resource_params{id = ResId,
params = Params,
status = #{is_alive => true}},
emqx_rule_registry:add_resource_params(ResParams)
catch Class:Reason:ST ->
emqx_rule_monitor:ensure_resource_retrier(ResId),
erlang:raise(Class, {init_resource, Reason}, ST)
end.
Params = ?RAISE(Module:OnCreate(ResId, Config),
emqx_rule_monitor:ensure_resource_retrier(ResId), {Module, OnCreate}),
ResParams = #resource_params{id = ResId,
params = Params,
status = #{is_alive => true}},
emqx_rule_registry:add_resource_params(ResParams).

init_action(Module, OnCreate, ActionInstId, Params) ->
ok = emqx_rule_metrics:create_metrics(ActionInstId),
Expand Down