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

fix(config): change handler name to emqx_data_bridge_config_handler

This commit is contained in:
Shawn 2021-06-15 19:50:39 +08:00 committed by turtleDeng
parent b11afc6997
commit 444c721f93
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/emqx/src/emqx_config_handler.erl
View File

@ -74,7 +74,10 @@ update_config(top, Config) ->
emqx_config:put(Config), emqx_config:put(Config),
save_config_to_disk(Config); save_config_to_disk(Config);
update_config(Handler, Config) -> update_config(Handler, Config) ->
gen_server:cast(Handler, {handle_update_config, Config}). case is_process_alive(whereis(Handler)) of
true -> gen_server:cast(Handler, {handle_update_config, Config});
false -> error({not_alive, Handler})
end.
%%============================================================================ %%============================================================================
%% callbacks of emqx_config_handler (the top-level handler) %% callbacks of emqx_config_handler (the top-level handler)

9
apps/emqx_data_bridge/src/emqx_data_bridge_api.erl
View File

@ -76,7 +76,7 @@ create_bridge(#{name := Name}, Params) ->
emqx_data_bridge:name_to_resource_id(Name), emqx_data_bridge:name_to_resource_id(Name),
emqx_data_bridge:resource_type(BridgeType), Config) of emqx_data_bridge:resource_type(BridgeType), Config) of
{ok, Data} -> {ok, Data} ->
emqx_config_handler:update_config(emqx_data_bridge, get_all_configs()), update_config(),
{200, #{code => 0, data => format_api_reply(emqx_resource_api:format_data(Data))}}; {200, #{code => 0, data => format_api_reply(emqx_resource_api:format_data(Data))}};
{error, already_created} -> {error, already_created} ->
{400, #{code => 102, message => <<"bridge already created: ", Name/binary>>}}; {400, #{code => 102, message => <<"bridge already created: ", Name/binary>>}};
@ -93,7 +93,7 @@ update_bridge(#{name := Name}, Params) ->
emqx_data_bridge:name_to_resource_id(Name), emqx_data_bridge:name_to_resource_id(Name),
emqx_data_bridge:resource_type(BridgeType), Config, []) of emqx_data_bridge:resource_type(BridgeType), Config, []) of
{ok, Data} -> {ok, Data} ->
emqx_config_handler:update_config(emqx_data_bridge, get_all_configs()), update_config(),
{200, #{code => 0, data => format_api_reply(emqx_resource_api:format_data(Data))}}; {200, #{code => 0, data => format_api_reply(emqx_resource_api:format_data(Data))}};
{error, not_found} -> {error, not_found} ->
{400, #{code => 102, message => <<"bridge not_found: ", Name/binary>>}}; {400, #{code => 102, message => <<"bridge not_found: ", Name/binary>>}};
@ -106,7 +106,7 @@ update_bridge(#{name := Name}, Params) ->
delete_bridge(#{name := Name}, _Params) -> delete_bridge(#{name := Name}, _Params) ->
case emqx_resource:remove(emqx_data_bridge:name_to_resource_id(Name)) of case emqx_resource:remove(emqx_data_bridge:name_to_resource_id(Name)) of
ok -> ok ->
emqx_config_handler:update_config(emqx_data_bridge, get_all_configs()), update_config(),
{200, #{code => 0, data => #{}}}; {200, #{code => 0, data => #{}}};
{error, Reason} -> {error, Reason} ->
{500, #{code => 102, message => emqx_resource_api:stringnify(Reason)}} {500, #{code => 102, message => emqx_resource_api:stringnify(Reason)}}
@ -123,3 +123,6 @@ format_conf(#{resource_type := Type, id := Id, config := Conf}) ->
get_all_configs() -> get_all_configs() ->
[format_conf(Data) || Data <- emqx_data_bridge:list_bridges()]. [format_conf(Data) || Data <- emqx_data_bridge:list_bridges()].
update_config() ->
emqx_config_handler:update_config(emqx_data_bridge_config_handler, get_all_configs()).

2
apps/emqx_resource/examples/demo.md
View File

@ -105,7 +105,6 @@ To create a mysql data bridge:
BridgeMySQL='{ BridgeMySQL='{
"type": "mysql", "type": "mysql",
"status": "started", "status": "started",
"name": "mysql-def",
"config": { "config": {
"verify": false, "verify": false,
"user": "root", "user": "root",
@ -134,7 +133,6 @@ To update an existing data bridge:
BridgeMySQL='{ BridgeMySQL='{
"type": "mysql", "type": "mysql",
"status": "started", "status": "started",
"name": "mysql-def",
"config": { "config": {
"verify": false, "verify": false,
"user": "root", "user": "root",