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

fix(import): fix import error

This commit is contained in:
wwhai 2021-03-23 21:30:27 +08:00 committed by tigercl
parent 09c4f6eef0
commit 3ea8039d90
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/emqx_management/src/emqx_mgmt_data_backup.erl
View File

@ -268,13 +268,12 @@ compatible_version(#{<<"id">> := ID,
CovertFun = fun(Int) -> CovertFun = fun(Int) ->
list_to_binary(integer_to_list(Int) ++ "s") list_to_binary(integer_to_list(Int) ++ "s")
end, end,
Cfg = make_new_config(#{<<"method">> => Method, Cfg = make_new_config(#{<<"pool_size">> => PoolSize,
<<"pool_size">> => PoolSize,
<<"connect_timeout">> => CovertFun(ConnectTimeout), <<"connect_timeout">> => CovertFun(ConnectTimeout),
<<"request_timeout">> => CovertFun(RequestTimeout), <<"request_timeout">> => CovertFun(RequestTimeout),
<<"url">> => URL}), <<"url">> => URL}),
{ok, _Resource} = import_resource(Resource#{<<"config">> := Cfg}), {ok, _Resource} = import_resource(Resource#{<<"config">> := Cfg}),
NHeaders = maps:put(<<"content-type">>, ContentType, Headers), NHeaders = maps:put(<<"content-type">>, ContentType, covert_empty_headers(Headers)),
[{ID, #{headers => NHeaders, method => Method}} | Acc]; [{ID, #{headers => NHeaders, method => Method}} | Acc];
% 4.2.0 % 4.2.0
compatible_version(#{<<"id">> := ID, compatible_version(#{<<"id">> := ID,
@ -282,14 +281,9 @@ compatible_version(#{<<"id">> := ID,
<<"config">> := #{<<"headers">> := Headers, <<"config">> := #{<<"headers">> := Headers,
<<"method">> := Method,%% 4.2.0 Different here <<"method">> := Method,%% 4.2.0 Different here
<<"url">> := URL}} = Resource, Acc) -> <<"url">> := URL}} = Resource, Acc) ->
Cfg = make_new_config(#{<<"method">> => Method, Cfg = make_new_config(#{<<"url">> => URL}),
<<"url">> => URL}),
{ok, _Resource} = import_resource(Resource#{<<"config">> := Cfg}), {ok, _Resource} = import_resource(Resource#{<<"config">> := Cfg}),
NHeaders = maps:put(<<"content-type">>, <<"application/json">> , NHeaders = maps:put(<<"content-type">>, <<"application/json">> , covert_empty_headers(Headers)),
case Headers of
[] -> #{};
Other -> Other
end),
[{ID, #{headers => NHeaders, method => Method}} | Acc]; [{ID, #{headers => NHeaders, method => Method}} | Acc];
%% bridge mqtt %% bridge mqtt
@ -315,10 +309,9 @@ compatible_version(#{<<"id">> := ID,
<<"content_type">> := ContentType,%% 4.2.3 Different here <<"content_type">> := ContentType,%% 4.2.3 Different here
<<"method">> := Method, <<"method">> := Method,
<<"url">> := URL}} = Resource, Acc) -> <<"url">> := URL}} = Resource, Acc) ->
Cfg = make_new_config(#{<<"method">> => Method, Cfg = make_new_config(#{<<"url">> => URL}),
<<"url">> => URL}),
{ok, _Resource} = import_resource(Resource#{<<"config">> := Cfg}), {ok, _Resource} = import_resource(Resource#{<<"config">> := Cfg}),
NHeaders = maps:put(<<"content-type">>, ContentType, Headers), NHeaders = maps:put(<<"content-type">>, ContentType, covert_empty_headers(Headers)),
[{ID, #{headers => NHeaders, method => Method}} | Acc]; [{ID, #{headers => NHeaders, method => Method}} | Acc];
% normal version % normal version
compatible_version(Resource, Acc) -> compatible_version(Resource, Acc) ->
@ -327,8 +320,8 @@ compatible_version(Resource, Acc) ->
make_new_config(Cfg) -> make_new_config(Cfg) ->
Config = #{<<"pool_size">> => 8, Config = #{<<"pool_size">> => 8,
<<"connect_timeout">> => <<"3s">>, <<"connect_timeout">> => <<"5s">>,
<<"request_timeout">> => <<"3s">>, <<"request_timeout">> => <<"5s">>,
<<"cacertfile">> => <<>>, <<"cacertfile">> => <<>>,
<<"certfile">> => <<>>, <<"certfile">> => <<>>,
<<"keyfile">> => <<>>, <<"keyfile">> => <<>>,
@ -649,3 +642,9 @@ do_import_extra_data(Data, _Version) ->
-else. -else.
do_import_extra_data(_Data, _Version) -> ok. do_import_extra_data(_Data, _Version) -> ok.
-endif. -endif.
covert_empty_headers(Headers) ->
case Headers of
[] -> #{};
Other -> Other
end.