summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-05-22 14:29:42 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2014-05-22 14:29:42 +0100
commit57b9af36652ab2ea156702da14ce816fbf746d6f (patch)
tree7c7b9a16d8f93b5be97236b89a9791b906751932
parent53c5b403ef621dad544b821db5ce08bc5d0d0bb9 (diff)
downloadrabbitmq-server-bug26200.tar.gz
pretty-print non-inet errorsbug26200
if it's not an atom it cannot possibly be an inet error
-rw-r--r--src/rabbit_reader.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index d8ceeceb..ddaf205e 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -188,9 +188,11 @@ server_capabilities(_) ->
log(Level, Fmt, Args) -> rabbit_log:log(connection, Level, Fmt, Args).
-socket_error(Reason) ->
+socket_error(Reason) when is_atom(Reason) ->
log(error, "error on AMQP connection ~p: ~s~n",
- [self(), rabbit_misc:format_inet_error(Reason)]).
+ [self(), rabbit_misc:format_inet_error(Reason)]);
+socket_error(Reason) ->
+ log(error, "error on AMQP connection ~p:~n~p~n", [self(), Reason]).
inet_op(F) -> rabbit_misc:throw_on_error(inet_error, F).