Merge pull request #202 from legoscia/bug26427

Be quiet about sockets closed during SSL upgrade

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).