summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-02-17 14:11:32 +0000
committerMatthias Radestock <matthias@lshift.net>2009-02-17 14:11:32 +0000
commit8d8f8af34dd699c22434563b2d932df7e87cc557 (patch)
treec27f9653ea685fa8419a6fbfe5d391e3f9ed5e63
parent34509397b4a0c2844765afe7ca30bfd2f2fd99a5 (diff)
downloadrabbitmq-server-bug20374.tar.gz
make it easier to add more exceptions to the 'warning' category in futurebug20374
-rw-r--r--src/rabbit_reader.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 09148bf0..9f642e35 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -231,12 +231,12 @@ start_connection(Parent, Deb, ClientSock) ->
connection_state = pre_init},
handshake, 8))
catch
- connection_closed_abruptly ->
- rabbit_log:warning("TCP connection ~p from ~s:~p closed abruptly~n",
- [self(), PeerAddressS, PeerPort]);
- 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]),