|
|
@@ -59,12 +59,18 @@ start_grpc_server(GwName, Options = #{bind := ListenOn}) ->
|
|
|
SslOpts ->
|
|
|
[{ssl_options, SslOpts}]
|
|
|
end,
|
|
|
- _ = grpc:start_server(GwName, ListenOn, Services, SvrOptions),
|
|
|
- ?ULOG("Start ~ts gRPC server on ~p successfully.~n", [GwName, ListenOn]).
|
|
|
+ case grpc:start_server(GwName, ListenOn, Services, SvrOptions) of
|
|
|
+ {ok, _SvrPid} ->
|
|
|
+ console_print("Start ~ts gRPC server on ~p successfully.",
|
|
|
+ [GwName, ListenOn]);
|
|
|
+ {error, Reason} ->
|
|
|
+ ?ELOG("Falied to start ~ts gRPC server on ~p, reason: ~p",
|
|
|
+ [GwName, ListenOn, Reason])
|
|
|
+ end.
|
|
|
|
|
|
stop_grpc_server(GwName) ->
|
|
|
_ = grpc:stop_server(GwName),
|
|
|
- ?ULOG("Stop ~s gRPC server successfully.~n", [GwName]).
|
|
|
+ console_print("Stop ~s gRPC server successfully.~n", [GwName]).
|
|
|
|
|
|
start_grpc_client_channel(_GwName, undefined) ->
|
|
|
undefined;
|
|
|
@@ -157,8 +163,8 @@ start_listener(GwName, Ctx, {Type, LisName, ListenOn, SocketOpts, Cfg}) ->
|
|
|
ListenOnStr = emqx_gateway_utils:format_listenon(ListenOn),
|
|
|
case start_listener(GwName, Ctx, Type, LisName, ListenOn, SocketOpts, Cfg) of
|
|
|
{ok, Pid} ->
|
|
|
- ?ULOG("Gateway ~ts:~ts:~ts on ~ts started.~n",
|
|
|
- [GwName, Type, LisName, ListenOnStr]),
|
|
|
+ console_print("Gateway ~ts:~ts:~ts on ~ts started.~n",
|
|
|
+ [GwName, Type, LisName, ListenOnStr]),
|
|
|
Pid;
|
|
|
{error, Reason} ->
|
|
|
?ELOG("Failed to start gateway ~ts:~ts:~ts on ~ts: ~0p~n",
|
|
|
@@ -212,8 +218,9 @@ stop_listener(GwName, {Type, LisName, ListenOn, SocketOpts, Cfg}) ->
|
|
|
StopRet = stop_listener(GwName, Type, LisName, ListenOn, SocketOpts, Cfg),
|
|
|
ListenOnStr = emqx_gateway_utils:format_listenon(ListenOn),
|
|
|
case StopRet of
|
|
|
- ok -> ?ULOG("Gateway ~ts:~ts:~ts on ~ts stopped.~n",
|
|
|
- [GwName, Type, LisName, ListenOnStr]);
|
|
|
+ ok ->
|
|
|
+ console_print("Gateway ~ts:~ts:~ts on ~ts stopped.~n",
|
|
|
+ [GwName, Type, LisName, ListenOnStr]);
|
|
|
{error, Reason} ->
|
|
|
?ELOG("Failed to stop gateway ~ts:~ts:~ts on ~ts: ~0p~n",
|
|
|
[GwName, Type, LisName, ListenOnStr, Reason])
|
|
|
@@ -223,3 +230,9 @@ stop_listener(GwName, {Type, LisName, ListenOn, SocketOpts, Cfg}) ->
|
|
|
stop_listener(GwName, Type, LisName, ListenOn, _SocketOpts, _Cfg) ->
|
|
|
Name = emqx_gateway_utils:listener_id(GwName, Type, LisName),
|
|
|
esockd:close(Name, ListenOn).
|
|
|
+
|
|
|
+-ifndef(TEST).
|
|
|
+console_print(Fmt, Args) -> ?ULOG(Fmt, Args).
|
|
|
+-else.
|
|
|
+console_print(_Fmt, _Args) -> ok.
|
|
|
+-endif.
|