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

fix: load bad configs return unknown msg

This commit is contained in:
zhongwencool 2024-06-12 15:11:09 +08:00
parent b4cffc581b
commit 8aab919f74
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_conf/src/emqx_conf_cli.erl
View File

@ -237,6 +237,12 @@ load_config(Bin, Opts) when is_binary(Bin) ->
case hocon:binary(Bin) of case hocon:binary(Bin) of
{ok, RawConf} -> {ok, RawConf} ->
load_config_from_raw(RawConf, Opts); load_config_from_raw(RawConf, Opts);
%% Type is scan_error, parse_error...
{error, {Type, Meta = #{reason := Reason}}} ->
{error, Meta#{
reason => unicode:characters_to_binary(Reason),
type => Type
}};
{error, Reason} -> {error, Reason} ->
{error, Reason} {error, Reason}
end. end.

4
apps/emqx_management/src/emqx_mgmt_api_configs.erl
View File

@ -364,10 +364,10 @@ configs(get, #{query_string := QueryStr, headers := Headers}, _Req) ->
{error, _} = Error -> {400, #{code => 'INVALID_ACCEPT', message => ?ERR_MSG(Error)}} {error, _} = Error -> {400, #{code => 'INVALID_ACCEPT', message => ?ERR_MSG(Error)}}
end; end;
configs(put, #{body := Conf, query_string := #{<<"mode">> := Mode} = QS}, _Req) -> configs(put, #{body := Conf, query_string := #{<<"mode">> := Mode} = QS}, _Req) ->
IngnoreReadonly = maps:get(<<"ignore_readonly">>, QS, false), IgnoreReadonly = maps:get(<<"ignore_readonly">>, QS, false),
case case
emqx_conf_cli:load_config(Conf, #{ emqx_conf_cli:load_config(Conf, #{
mode => Mode, log => none, ignore_readonly => IngnoreReadonly mode => Mode, log => none, ignore_readonly => IgnoreReadonly
}) })
of of
ok -> ok ->