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

fix(emqx_resource): merge conflict

This commit is contained in:
Shawn 2021-06-07 21:25:19 +08:00
parent a37b3957e3
commit 16c0a5b80a
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx_resource/src/emqx_resource_instance.erl
View File

@ -100,16 +100,6 @@ save_config_to_disk(InstId, ResourceType, Config) ->
emqx_data_dir() ->
"data".
save_config_to_disk(InstId, ResourceType, Config) ->
%% TODO: send an event to the config handler, and the hander (single process)
%% will dump configs for all instances (from an ETS table) to a file.
file:write_file(filename:join([emqx_data_dir(), binary_to_list(InstId) ++ ".conf"]),
jsx:encode(#{id => InstId, resource_type => ResourceType,
config => emqx_resource:call_jsonify(ResourceType, Config)})).
emqx_data_dir() ->
"data".
%%------------------------------------------------------------------------------
%% gen_server callbacks
%%------------------------------------------------------------------------------