diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-05-22 14:35:53 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-05-22 14:35:53 +0100 |
| commit | b47e05e03bd3c07bb4d0370a4b90c3121dfbad44 (patch) | |
| tree | 235f83ba1a5e503c7d6a6b333b4f3116862d49cc /src | |
| parent | 7ab9f4b1caba2fa34ed505c870d08605b0a779f8 (diff) | |
| parent | 7713d27e5d00e3db79ee4c781cf147f9cb6d4036 (diff) | |
| download | rabbitmq-server-git-b47e05e03bd3c07bb4d0370a4b90c3121dfbad44.tar.gz | |
merge stable into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index d8ceecebb7..ddaf205e7d 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). |