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

Merge pull request #4432 from qzhuyan/fix/emqx-4426-wss-listener-rendering 

fix(cuttlefish-schema): parse IP addr for SSL listeners.
This commit is contained in:
William Yang 2021-03-24 18:16:30 +01:00 committed by GitHub
parent a898f6be1e 8f6f649703
commit 49bdcf1332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
priv/emqx.schema
View File

@ -2011,19 +2011,18 @@ end}.
{honor_cipher_order, cuttlefish:conf_get(Prefix ++ ".honor_cipher_order", Conf, undefined)}]) {honor_cipher_order, cuttlefish:conf_get(Prefix ++ ".honor_cipher_order", Conf, undefined)}])
end, 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) -> TcpListeners = fun(Type, Name) ->
Prefix = string:join(["listener", Type, Name], "."), Prefix = string:join(["listener", Type, Name], "."),
ListenOnN = case cuttlefish:conf_get(Prefix, Conf, undefined) of ListenOnN = case cuttlefish:conf_get(Prefix, Conf, undefined) of
undefined -> []; undefined -> [];
ListenOn -> ListenOn -> Listen_fix(ListenOn)
case ListenOn of
{Ip, Port} ->
case inet:parse_address(Ip) of
{ok ,R} -> {R, Port};
_ -> {Ip, Port}
end;
Other -> Other
end
end, end,
[#{ proto => Atom(Type) [#{ proto => Atom(Type)
, name => Name , name => Name
@ -2043,7 +2042,7 @@ end}.
ListenOn -> ListenOn ->
[#{ proto => Atom(Type) [#{ proto => Atom(Type)
, name => Name , name => Name
, listen_on => ListenOn , listen_on => Listen_fix(ListenOn)
, opts => [ {deflate_options, DeflateOpts(Prefix)} , opts => [ {deflate_options, DeflateOpts(Prefix)}
, {tcp_options, TcpOpts(Prefix)} , {tcp_options, TcpOpts(Prefix)}
, {ssl_options, SslOpts(Prefix)} , {ssl_options, SslOpts(Prefix)}