summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Henoch <magnus.henoch@gmail.com>2015-06-29 12:38:56 +0100
committerMagnus Henoch <magnus.henoch@gmail.com>2015-06-29 12:38:56 +0100
commit8356c5ac880f407b79c01f4f656e20806a62f00f (patch)
treeb5cb540787653f76e3bf16e98b44ba729bb09331
parented351cf9b6660764e99ad2fd2f076c73269251ae (diff)
downloadrabbitmq-server-git-8356c5ac880f407b79c01f4f656e20806a62f00f.tar.gz
Be quiet about sockets closed during SSL upgrade
Log such errors on debug level only, since this is probably a TCP healthcheck.
-rw-r--r--src/rabbit_reader.erl12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 0a1c503e02..1cc12dbd16 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -191,7 +191,17 @@ socket_error(Reason) when is_atom(Reason) ->
log(error, "Error on AMQP connection ~p: ~s~n",
[self(), rabbit_misc:format_inet_error(Reason)]);
socket_error(Reason) ->
- log(error, "Error on AMQP connection ~p:~n~p~n", [self(), Reason]).
+ Level =
+ case Reason of
+ {ssl_upgrade_error, closed} ->
+ %% The socket was closed while upgrading to SSL.
+ %% This is presumably a TCP healthcheck, so don't log
+ %% it unless specified otherwise.
+ debug;
+ _ ->
+ error
+ end,
+ log(Level, "Error on AMQP connection ~p:~n~p~n", [self(), Reason]).
inet_op(F) -> rabbit_misc:throw_on_error(inet_error, F).