attempt to close ssl connections gracefully but forcefully

gracefully...so that there is a good chance of TLS alerts making it
through, but forecfully (after a timeout) so we don't get stuck (or
worse, silently) holding on to file descriptors and processes.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index bd20deb2..4bcb347d 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -184,6 +184,7 @@ socket_op(Sock, Fun) ->
         {ok, Res}       -> Res;
         {error, Reason} -> log(error, "error on AMQP connection ~p: ~p~n",
                                [self(), Reason]),
+                           rabbit_net:fast_close(Sock),
                            exit(normal)
     end.
 
@@ -242,8 +243,7 @@ start_connection(Parent, ChannelSupSupPid, Collector, StartHeartbeatFun, Deb,
         %% controlling process and hence its termination will close
         %% the socket. However, to keep the file_handle_cache
         %% accounting as accurate as possible we ought to close the
-        %% socket w/o delay before termination. fast_close does that,
-        %% though only for non-ssl sockets.
+        %% socket w/o delay before termination.
         rabbit_net:fast_close(ClientSock),
         rabbit_event:notify(connection_closed, [{pid, self()}])
     end,