summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-02-17 14:12:12 +0000
committerMatthias Radestock <matthias@lshift.net>2009-02-17 14:12:12 +0000
commitd7f02bef485c41563a203a4a1d8ee85e7e157dff (patch)
treec27f9653ea685fa8419a6fbfe5d391e3f9ed5e63
parent464195ec969b19dcf63dc53a5cc4894cdc00be1a (diff)
parent8d8f8af34dd699c22434563b2d932df7e87cc557 (diff)
downloadrabbitmq-server-d7f02bef485c41563a203a4a1d8ee85e7e157dff.tar.gz
merge bug20374 into default
-rw-r--r--src/rabbit_reader.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 12ee299e..9f642e35 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -231,8 +231,12 @@ start_connection(Parent, Deb, ClientSock) ->
connection_state = pre_init},
handshake, 8))
catch
- Ex -> rabbit_log:error("error on TCP connection ~p from ~s:~p~n~p~n",
- [self(), PeerAddressS, PeerPort, Ex])
+ Ex -> (if Ex == connection_closed_abruptly ->
+ fun rabbit_log:warning/2;
+ true ->
+ fun rabbit_log:error/2
+ end)("exception on TCP connection ~p from ~s:~p~n~p~n",
+ [self(), PeerAddressS, PeerPort, Ex])
after
rabbit_log:info("closing TCP connection ~p from ~s:~p~n",
[self(), PeerAddressS, PeerPort]),