diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index 7622ff69f..3ba0add04 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -14,6 +14,11 @@ * Fix AuthN JWKS SSL schema. Using schema in `emqx_schema`. [#8458](https://github.com/emqx/emqx/pull/8458) * `sentinel` field should be required when AuthN/AuthZ Redis using sentinel mode. [#8458](https://github.com/emqx/emqx/pull/8458) +## Enhancements + +* Improve the dashboard listener startup log, the listener name is no longer spliced with port information, + and the colon(:) is no longer displayed when IP is not specified.[#8480](https://github.com/emqx/emqx/pull/8480) + # 5.0.3 ## Bug fixes diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl index 61ed6c47d..3c508bacc 100644 --- a/apps/emqx/src/emqx_listeners.erl +++ b/apps/emqx/src/emqx_listeners.erl @@ -493,7 +493,7 @@ merge_default(Options) -> end. format_addr(Port) when is_integer(Port) -> - io_lib:format(":~w", [Port]); + io_lib:format("~w", [Port]); %% Print only the port number when bound on all interfaces format_addr({{0, 0, 0, 0}, Port}) -> format_addr(Port); diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl index 0e106f7a2..042c9d5d8 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard.erl @@ -159,7 +159,7 @@ listeners(Listeners) -> maps:get(enable, Conf) andalso begin {Conf1, Bind} = ip_port(Conf), - {true, {listener_name(Protocol, Conf1), Protocol, Bind, ranch_opts(Conf1)}} + {true, {listener_name(Protocol), Protocol, Bind, ranch_opts(Conf1)}} end end, maps:to_list(Listeners) @@ -208,19 +208,8 @@ ranch_opts(Options) -> filter_false(_K, false, S) -> S; filter_false(K, V, S) -> [{K, V} | S]. -listener_name(Protocol, #{port := Port, ip := IP}) -> - Name = - "dashboard:" ++ - atom_to_list(Protocol) ++ ":" ++ - inet:ntoa(IP) ++ ":" ++ - integer_to_list(Port), - list_to_atom(Name); -listener_name(Protocol, #{port := Port}) -> - Name = - "dashboard:" ++ - atom_to_list(Protocol) ++ ":" ++ - integer_to_list(Port), - list_to_atom(Name). +listener_name(Protocol) -> + list_to_atom(atom_to_list(Protocol) ++ ":dashboard"). authorize(Req) -> case cowboy_req:parse_header(<<"authorization">>, Req) of