Merge pull request #1836 from rabbitmq/rabbitmq-server-1835

Remove use of accept_ack

(cherry picked from commit 46d995d)

Author: michaelklishin

src/rabbit_networking.erl

@@ -35,7 +35,7 @@
          connection_info/1, connection_info/2,
          connection_info_all/0, connection_info_all/1,
          emit_connection_info_all/4, emit_connection_info_local/3,
-         close_connection/2, force_connection_event_refresh/1, accept_ack/2,
+         close_connection/2, force_connection_event_refresh/1,
          handshake/2, tcp_host/1]).
 
 %% Used by TCP-based transports, e.g. STOMP adapter
@@ -88,7 +88,6 @@
           [rabbit_types:infos()].
 -spec close_connection(pid(), string()) -> 'ok'.
 -spec force_connection_event_refresh(reference()) -> 'ok'.
--spec accept_ack(any(), rabbit_net:socket()) -> ok.
 
 -spec on_node_down(node()) -> 'ok'.
 -spec tcp_listener_addresses(listener_config()) -> [address()].
@@ -368,16 +367,16 @@ handshake(Ref, ProxyProtocol) ->
         true ->
             {ok, ProxyInfo} = ranch:recv_proxy_header(Ref, 1000),
             {ok, Sock} = ranch:handshake(Ref),
-            tune_buffer_size(Sock),
-            ok = file_handle_cache:obtain(),
+            setup_socket(Sock),
             {ok, {rabbit_proxy_socket, Sock, ProxyInfo}};
         false ->
-            ranch:handshake(Ref)
+            {ok, Sock} = ranch:handshake(Ref),
+            setup_socket(Sock),
+            {ok, Sock}
     end.
 
-accept_ack(Ref, Sock) ->
-    ok = ranch:accept_ack(Ref),
-    tune_buffer_size(Sock),
+setup_socket(Sock) ->
+    ok = tune_buffer_size(Sock),
     ok = file_handle_cache:obtain().
 
 tune_buffer_size(Sock) ->