From 64241c5d6bd4bedc191394131a628b1c2fa4a7ab Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 1 Aug 2014 11:55:09 +0400 Subject: Let exception handler do all the handshake failure logging --- src/rabbit_reader.erl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index fd5dc208..e6e94e28 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -596,13 +596,10 @@ handle_exception(State = #v1{connection = #connection{protocol = Protocol}, State1 = close_connection(terminate_channels(State)), ok = send_on_channel0(State1#v1.sock, CloseMethod, Protocol), State1; -handle_exception(State = #v1{connection_state = tuning, - connection = #connection{name = S}}, Channel, Reason) -> +handle_exception(State = #v1{connection_state = tuning}, Channel, Reason) -> %% We don't trust the client at this point - force them to wait %% for a bit so they can't DOS us with repeated failed logins etc. timer:sleep(?SILENT_CLOSE_DELAY * 1000), - log(error, "AMQP connection ~p (~s) handshake error:~n~p~n", - [self(), S, Reason]), throw({handshake_error, State#v1.connection_state, Channel, Reason}). %% we've "lost sync" with the client and hence must not accept any -- cgit v1.2.1