diff options
| author | Micael Karlberg <bmk@erlang.org> | 2021-12-02 18:26:41 +0100 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2021-12-02 18:26:41 +0100 |
| commit | 8633084be016f3e00c16e0b4dff79e6a0b563242 (patch) | |
| tree | 51ba6d5415382d25254aa5e462ab23a0cf36a9fe /lib/megaco | |
| parent | 3833c61faf675bbe9b773409a4b6a2ec67e6b2a8 (diff) | |
| download | erlang-8633084be016f3e00c16e0b4dff79e6a0b563242.tar.gz | |
[megaco] Include more info in error reason when connect fails
This is mostly to simplify debugging.
OTP-17817
Diffstat (limited to 'lib/megaco')
| -rw-r--r-- | lib/megaco/src/tcp/megaco_tcp.erl | 4 | ||||
| -rw-r--r-- | lib/megaco/test/megaco_tcp_SUITE.erl | 21 |
2 files changed, 16 insertions, 9 deletions
diff --git a/lib/megaco/src/tcp/megaco_tcp.erl b/lib/megaco/src/tcp/megaco_tcp.erl index 460e679efc..6ff8e5793f 100644 --- a/lib/megaco/src/tcp/megaco_tcp.erl +++ b/lib/megaco/src/tcp/megaco_tcp.erl @@ -217,14 +217,14 @@ connect(SupPid, Parameters) -> {error, Reason} -> ?d1("connect -> failed connecting: " "~n Reason: ~p", [Reason]), - Error = {error, {gen_tcp_connect, Reason}}, + Error = {error, {gen_tcp_connect, Reason, {Host, Port, IpOpt}}}, ?tcp_debug(Rec, "tcp connect failed", [Error]), Error; {'EXIT', _Reason} = Exit -> ?d1("connect -> connect exited: " "~n Exit: ~p", [Exit]), - Error = {error, {gen_tcp_connect, Exit}}, + Error = {error, {gen_tcp_connect, Exit, {Host, Port, IpOpt}}}, ?tcp_debug(Rec, "tcp connect failed", [Error]), Error diff --git a/lib/megaco/test/megaco_tcp_SUITE.erl b/lib/megaco/test/megaco_tcp_SUITE.erl index 88c7934894..43ecb335be 100644 --- a/lib/megaco/test/megaco_tcp_SUITE.erl +++ b/lib/megaco/test/megaco_tcp_SUITE.erl @@ -475,15 +475,22 @@ sendreceive(Config) when is_list(Config) -> try_tc(sendreceive, Pre, Case, Post). do_sendreceive(Config, [ServerNode, ClientNode]) -> - %% Create command sequences - p("create command sequences"), - ServerPort = ?SERVER_PORT(Config, 2), % 2944, - ServerCmds = sendreceive_server_commands(Config, ServerPort), + p("retrieve server info (host and port)"), + ServerPort = ?SERVER_PORT(Config, 2), % 2944, {ok, ServerHost} = inet:gethostname(), + + %% Create command sequences + p("create server command sequence: " + "~n Server Port: ~p" + "~n Server Host: ~p", [ServerPort, ServerHost]), + ServerCmds = sendreceive_server_commands(Config, ServerPort, ServerHost), + p("create client command sequence: " + "~n Server Port: ~p" + "~n Server Host: ~p", [ServerPort, ServerHost]), ClientCmds = sendreceive_client_commands(Config, ServerPort, ServerHost), %% Start the test procs used in the test-case, one for each node - p("start command handlers"), + p("start command handler(s)"), Server = server_start_command_handler(ServerNode, ServerCmds), p("server command handler started: ~p", [Server]), Client = client_start_command_handler(ClientNode, ClientCmds), @@ -496,8 +503,8 @@ do_sendreceive(Config, [ServerNode, ClientNode]) -> ok. -sendreceive_server_commands(Config, Port) -> - Opts = [{port, Port}], +sendreceive_server_commands(Config, Port, Host) -> + Opts = [{host, Host}, {port, Port}], Self = self(), [ #{id => 1, |