Since we always show the raw error and the expanded error let's get format_inet_error to do that.

5 files changed, 14 insertions, 13 deletions

diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index ab1c60635d..92dd15b68d 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -542,9 +542,11 @@ tcp_name(Prefix, IPAddress, Port)
     list_to_atom(
       format("~w_~s:~w", [Prefix, inet_parse:ntoa(IPAddress), Port])).
 
-format_inet_error(address) -> "cannot connect to host/port";
-format_inet_error(timeout) -> "timed out";
-format_inet_error(Error)   -> inet:format_error(Error).
+format_inet_error(E) -> format("~s (~s)", [E, format_inet_error0(E)]).
+
+format_inet_error0(address) -> "cannot connect to host/port";
+format_inet_error0(timeout) -> "timed out";
+format_inet_error0(Error)   -> inet:format_error(Error).
 
 %% This is a modified version of Luke Gorrie's pmap -
 %% http://lukego.livejournal.com/6753.html - that doesn't care about
diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl
index b0dcabf32d..9965c998f1 100644
--- a/src/rabbit_nodes.erl
+++ b/src/rabbit_nodes.erl
@@ -77,8 +77,8 @@ diagnostics_node(Node) ->
     {Name, Host} = parts(Node),
     case names(Host) of
         {error, EpmdReason} ->
-            {"- unable to connect to epmd on ~s: ~w (~s)",
-             [Host, EpmdReason, rabbit_misc:format_inet_error(EpmdReason)]};
+            {"- unable to connect to epmd on ~s: ~s",
+             [Host, rabbit_misc:format_inet_error(EpmdReason)]};
         {ok, NamePorts} ->
             [{"- ~s:", [Node]} | diagnostics_node0(Name, Host, NamePorts)]
     end.
@@ -104,7 +104,7 @@ diagnostics_node0(Name, Host, NamePorts) ->
                      [{"  * TCP connection succeeded~n"
                        "  * suggestion: is the cookie set correctly?", []}];
                  {error, Reason} ->
-                     [{"  * can't establish TCP connection, reason: ~p~n"
+                     [{"  * can't establish TCP connection, reason: ~s~n"
                        "  * suggestion: blocked by firewall?",
                        [rabbit_misc:format_inet_error(Reason)]}]
              end]
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index be407a024d..6e2145eaa8 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -65,8 +65,7 @@ duplicate_node_check(NodeStr) ->
                 false -> ok
             end;
         {error, EpmdReason} ->
-            io:format("ERROR: epmd error for host ~p: ~p (~s)~n",
-                      [NodeHost, EpmdReason,
-                       rabbit_misc:format_inet_error(EpmdReason)]),
+            io:format("ERROR: epmd error for host ~s: ~s~n",
+                      [NodeHost, rabbit_misc:format_inet_error(EpmdReason)]),
             rabbit_misc:quit(?ERROR_CODE)
     end.
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 4a1948295a..3659f02132 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -188,8 +188,8 @@ server_capabilities(_) ->
 log(Level, Fmt, Args) -> rabbit_log:log(connection, Level, Fmt, Args).
 
 socket_error(Reason) ->
-    log(error, "error on AMQP connection ~p: ~p (~s)~n",
-        [self(), Reason, rabbit_misc:format_inet_error(Reason)]).
+    log(error, "error on AMQP connection ~p: ~s~n",
+        [self(), rabbit_misc:format_inet_error(Reason)]).
 
 inet_op(F) -> rabbit_misc:throw_on_error(inet_error, F).
 
diff --git a/src/tcp_acceptor.erl b/src/tcp_acceptor.erl
index 267ce4f1aa..a7a56ea112 100644
--- a/src/tcp_acceptor.erl
+++ b/src/tcp_acceptor.erl
@@ -63,9 +63,9 @@ handle_info({inet_async, LSock, Ref, {ok, Sock}},
         {error, Err}      -> {ok, {IPAddress, Port}} = inet:sockname(LSock),
                              error_logger:error_msg(
                                "failed to tune buffer size of "
-                               "connection accepted on ~s:~p - ~p (~s)~n",
+                               "connection accepted on ~s:~p - ~s~n",
                                [rabbit_misc:ntoab(IPAddress), Port,
-                                Err, rabbit_misc:format_inet_error(Err)]),
+                                rabbit_misc:format_inet_error(Err)]),
                              catch port_close(Sock)
     end,