diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-08-01 12:03:15 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-08-01 12:03:15 +0400 |
| commit | 2e0ca6cc280b6a660d2de0a1a3da927da88ba5d3 (patch) | |
| tree | 9413a5d0970332a982d20092b990c1b82ae7a540 | |
| parent | acccf9bf90fae52d7a3936f11caa360ce6f1c7c0 (diff) | |
| parent | 95c9cd57756aadc9dbbbeef8f6312f338ed7cf8e (diff) | |
| download | rabbitmq-server-git-2e0ca6cc280b6a660d2de0a1a3da927da88ba5d3.tar.gz | |
merge bug26313 into stable (again)
| -rw-r--r-- | src/rabbit_reader.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index fd5dc20810..e6e94e2828 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 |