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

refactor(emqx_schema): Code style

This commit is contained in:
k32 2021-11-18 19:00:59 +01:00
parent deccba3406
commit c9a59968ef
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -741,22 +741,10 @@ sort_log_levels(Levels) ->
%% utils %% utils
-spec(conf_get(string() | [string()], hocon:config()) -> term()). -spec(conf_get(string() | [string()], hocon:config()) -> term()).
conf_get(Key, Conf) -> conf_get(Key, Conf) ->
V = hocon_schema:get_value(Key, Conf), ensure_list(hocon_schema:get_value(Key, Conf)).
case is_binary(V) of
true ->
binary_to_list(V);
false ->
V
end.
conf_get(Key, Conf, Default) -> conf_get(Key, Conf, Default) ->
V = hocon_schema:get_value(Key, Conf, Default), ensure_list(hocon_schema:get_value(Key, Conf, Default)).
case is_binary(V) of
true ->
binary_to_list(V);
false ->
V
end.
filter(Opts) -> filter(Opts) ->
[{K, V} || {K, V} <- Opts, V =/= undefined]. [{K, V} || {K, V} <- Opts, V =/= undefined].
@ -812,5 +800,14 @@ to_atom(Str) when is_list(Str) ->
to_atom(Bin) when is_binary(Bin) -> to_atom(Bin) when is_binary(Bin) ->
binary_to_atom(Bin, utf8). binary_to_atom(Bin, utf8).
-spec ensure_list(binary() | list(char())) -> list(char()).
ensure_list(V) ->
case is_binary(V) of
true ->
binary_to_list(V);
false ->
V
end.
roots(Module) -> roots(Module) ->
lists:map(fun({_BinName, Root}) -> Root end, hocon_schema:roots(Module)). lists:map(fun({_BinName, Root}) -> Root end, hocon_schema:roots(Module)).