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

fix(bridge): remove bridge if exception happens during creation

This commit is contained in:
Thales Macedo Garitezi 2023-05-24 17:47:57 -03:00
parent cb34bc5c46
commit e43517188f
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/emqx_bridge/src/emqx_bridge.erl
View File

@ -227,9 +227,13 @@ post_config_update(_, _Req, NewConf, OldConf, _AppEnv) ->
diff_confs(NewConf, OldConf), diff_confs(NewConf, OldConf),
%% The config update will be failed if any task in `perform_bridge_changes` failed. %% The config update will be failed if any task in `perform_bridge_changes` failed.
Result = perform_bridge_changes([ Result = perform_bridge_changes([
{fun emqx_bridge_resource:remove/4, Removed}, #{action => fun emqx_bridge_resource:remove/4, data => Removed},
{fun emqx_bridge_resource:create/4, Added}, #{
{fun emqx_bridge_resource:update/4, Updated} action => fun emqx_bridge_resource:create/4,
data => Added,
on_exception_fn => fun emqx_bridge_resource:remove/4
},
#{action => fun emqx_bridge_resource:update/4, data => Updated}
]), ]),
ok = unload_hook(), ok = unload_hook(),
ok = load_hook(NewConf), ok = load_hook(NewConf),
@ -345,7 +349,8 @@ perform_bridge_changes(Tasks) ->
perform_bridge_changes([], Result) -> perform_bridge_changes([], Result) ->
Result; Result;
perform_bridge_changes([{Action, MapConfs} | Tasks], Result0) -> perform_bridge_changes([#{action := Action, data := MapConfs} = Task | Tasks], Result0) ->
OnException = maps:get(on_exception_fn, Task, fun(_Type, _Name, _Conf, _Opts) -> ok end),
Result = maps:fold( Result = maps:fold(
fun fun
({_Type, _Name}, _Conf, {error, Reason}) -> ({_Type, _Name}, _Conf, {error, Reason}) ->
@ -359,9 +364,21 @@ perform_bridge_changes([{Action, MapConfs} | Tasks], Result0) ->
end; end;
({Type, Name}, Conf, _) -> ({Type, Name}, Conf, _) ->
ResOpts = emqx_resource:fetch_creation_opts(Conf), ResOpts = emqx_resource:fetch_creation_opts(Conf),
case Action(Type, Name, Conf, ResOpts) of try Action(Type, Name, Conf, ResOpts) of
{error, Reason} -> {error, Reason}; {error, Reason} -> {error, Reason};
Return -> Return Return -> Return
catch
Kind:Error:Stacktrace ->
?SLOG(error, #{
msg => "bridge_config_update_exception",
kind => Kind,
error => Error,
type => Type,
name => Name,
stacktrace => Stacktrace
}),
OnException(Type, Name, Conf, ResOpts),
erlang:raise(Kind, Error, Stacktrace)
end end
end, end,
Result0, Result0,