fix(emqx): Do not io:format when testing

This commit is contained in:
Zaiming Shi 2021-04-08 20:19:48 +02:00 committed by Zaiming (Stone) Shi
parent 25e0e121e5
commit 7667b65710
2 changed files with 14 additions and 2 deletions

View File

@ -74,8 +74,13 @@ print_otp_version_warning() ->
print_banner() -> print_banner() ->
io:format("Starting ~s on node ~s~n", [?APP, node()]). io:format("Starting ~s on node ~s~n", [?APP, node()]).
-ifndef(TEST).
print_vsn() -> print_vsn() ->
io:format("~s ~s is running now!~n", [get_description(), get_release()]). io:format("~s ~s is running now!~n", [get_description(), get_release()]).
-else.
print_vsn() ->
ok.
-endif.
get_description() -> get_description() ->
{ok, Descr0} = application:get_key(?APP, description), {ok, Descr0} = application:get_key(?APP, description),

View File

@ -106,14 +106,21 @@ format_listen_on(ListenOn) -> format(ListenOn).
start_listener(#{proto := Proto, name := Name, listen_on := ListenOn, opts := Options}) -> start_listener(#{proto := Proto, name := Name, listen_on := ListenOn, opts := Options}) ->
ID = identifier(Proto, Name), ID = identifier(Proto, Name),
case start_listener(Proto, ListenOn, Options) of case start_listener(Proto, ListenOn, Options) of
{ok, _} -> io:format("Start ~s listener on ~s successfully.~n", {ok, _} ->
[ID, format(ListenOn)]); console_print("Start ~s listener on ~s successfully.~n", [ID, format(ListenOn)]);
{error, Reason} -> {error, Reason} ->
io:format(standard_error, "Failed to start mqtt listener ~s on ~s: ~0p~n", io:format(standard_error, "Failed to start mqtt listener ~s on ~s: ~0p~n",
[ID, format(ListenOn), Reason]), [ID, format(ListenOn), Reason]),
error(Reason) error(Reason)
end. end.
-ifndef(TEST).
console_print(Fmt, Args) ->
io:format(Fmt, Args).
-else.
console_print(_Fmt, _Args) -> ok.
-endif.
%% Start MQTT/TCP listener %% Start MQTT/TCP listener
-spec(start_listener(esockd:proto(), esockd:listen_on(), [esockd:option()]) -spec(start_listener(esockd:proto(), esockd:listen_on(), [esockd:option()])
-> {ok, pid()} | {error, term()}). -> {ok, pid()} | {error, term()}).