diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-08-01 12:22:22 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-08-01 12:22:22 +0400 |
| commit | f0695bede20ea0f91420888d3aef072ce39c7f14 (patch) | |
| tree | bc5a8b8e3b77b12439b01462608b41b1bddae795 | |
| parent | 4dd82c92c113bae870d5e4653e361083c2ca82ce (diff) | |
| parent | 1c4d45b91bea0a64154ca451bb2ae49e3b8aa918 (diff) | |
| download | rabbitmq-server-f0695bede20ea0f91420888d3aef072ce39c7f14.tar.gz | |
merge stable into default
| -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 ea5d0f81..2ac24f97 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -611,13 +611,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 |