diff --git a/priv/emqx.schema b/priv/emqx.schema index 2e1248c50..28ee95782 100644 --- a/priv/emqx.schema +++ b/priv/emqx.schema @@ -2006,19 +2006,18 @@ end}. {honor_cipher_order, cuttlefish:conf_get(Prefix ++ ".honor_cipher_order", Conf, undefined)}]) end, + Listen_fix = fun({Ip, Port}) -> case inet:parse_address(Ip) of + {ok, R} -> {R, Port}; + _ -> {Ip, Port} + end; + (Other) -> Other + end, + TcpListeners = fun(Type, Name) -> Prefix = string:join(["listener", Type, Name], "."), ListenOnN = case cuttlefish:conf_get(Prefix, Conf, undefined) of undefined -> []; - ListenOn -> - case ListenOn of - {Ip, Port} -> - case inet:parse_address(Ip) of - {ok ,R} -> {R, Port}; - _ -> {Ip, Port} - end; - Other -> Other - end + ListenOn -> Listen_fix(ListenOn) end, [#{ proto => Atom(Type) , name => Name @@ -2038,7 +2037,7 @@ end}. ListenOn -> [#{ proto => Atom(Type) , name => Name - , listen_on => ListenOn + , listen_on => Listen_fix(ListenOn) , opts => [ {deflate_options, DeflateOpts(Prefix)} , {tcp_options, TcpOpts(Prefix)} , {ssl_options, SslOpts(Prefix)}