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

fix(emqx_bridge, emqx_retainer): hard code group name

This commit is contained in:
EMQ-YangM 2022-02-16 14:02:13 +08:00
parent 48942f9c93
commit f70fc1a3b0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,8 +222,7 @@ create(BridgeId, Conf) ->
create(Type, Name, Conf) -> create(Type, Name, Conf) ->
?SLOG(info, #{msg => "create bridge", type => Type, name => Name, ?SLOG(info, #{msg => "create bridge", type => Type, name => Name,
config => Conf}), config => Conf}),
Group = maps:get(group, Conf, <<"default">>), case emqx_resource:create_local(resource_id(Type, Name), <<"emqx_bridge">>, emqx_bridge:resource_type(Type),
case emqx_resource:create_local(resource_id(Type, Name), Group, emqx_bridge:resource_type(Type),
parse_confs(Type, Name, Conf), #{async_create => true}) of parse_confs(Type, Name, Conf), #{async_create => true}) of
{ok, already_created} -> maybe_disable_bridge(Type, Name, Conf); {ok, already_created} -> maybe_disable_bridge(Type, Name, Conf);
{ok, _} -> maybe_disable_bridge(Type, Name, Conf); {ok, _} -> maybe_disable_bridge(Type, Name, Conf);

2
apps/emqx_retainer/src/emqx_retainer.erl
View File

@ -480,7 +480,7 @@ create_resource(Context, #{type := DB} = Config) ->
ResourceID = erlang:iolist_to_binary([io_lib:format("~ts_~ts", [?APP, DB])]), ResourceID = erlang:iolist_to_binary([io_lib:format("~ts_~ts", [?APP, DB])]),
case emqx_resource:create( case emqx_resource:create(
ResourceID, ResourceID,
<<"default">>, <<"emqx_retainer">>,
list_to_existing_atom(io_lib:format("~ts_~ts", [emqx_connector, DB])), list_to_existing_atom(io_lib:format("~ts_~ts", [emqx_connector, DB])),
Config) of Config) of
{ok, already_created} -> {ok, already_created} ->