Move Protocol to after vhost consistently

5 files changed, 28 insertions, 26 deletions

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index b9d1baf060..12a668ad59 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -67,8 +67,8 @@
 -type(channel_number() :: non_neg_integer()).
 
 -spec(start_link/8 ::
-      (rabbit_types:protocol(), channel_number(), pid(), pid(),
-       rabbit_types:user(), rabbit_types:vhost(), pid(),
+      (channel_number(), pid(), pid(), rabbit_types:user(),
+       rabbit_types:vhost(), rabbit_types:protocol(), pid(),
        fun ((non_neg_integer()) -> rabbit_types:ok(pid()))) ->
                            rabbit_types:ok_pid_or_error()).
 -spec(do/2 :: (pid(), rabbit_framing:amqp_method_record()) -> 'ok').
@@ -95,11 +95,11 @@
 
 %%----------------------------------------------------------------------------
 
-start_link(Protocol, Channel, ReaderPid, WriterPid, User, VHost, CollectorPid,
+start_link(Channel, ReaderPid, WriterPid, User, VHost, Protocol, CollectorPid,
            StartLimiterFun) ->
     gen_server2:start_link(?MODULE,
-                           [Protocol, Channel, ReaderPid, WriterPid, User,
-                            VHost, CollectorPid, StartLimiterFun], []).
+                           [Channel, ReaderPid, WriterPid, User, VHost,
+                            Protocol, CollectorPid, StartLimiterFun], []).
 
 do(Pid, Method) ->
     do(Pid, Method, none).
@@ -153,7 +153,7 @@ ready_for_close(Pid) ->
 
 %%---------------------------------------------------------------------------
 
-init([Protocol, Channel, ReaderPid, WriterPid, User, VHost, CollectorPid,
+init([Channel, ReaderPid, WriterPid, User, VHost, Protocol, CollectorPid,
       StartLimiterFun]) ->
     process_flag(trap_exit, true),
     ok = pg_local:join(rabbit_channels, self()),
diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl
index 9bc0546c21..f528a9c6c1 100644
--- a/src/rabbit_channel_sup.erl
+++ b/src/rabbit_channel_sup.erl
@@ -31,11 +31,11 @@
 -export_type([start_link_args/0]).
 
 -type(start_link_args() ::
-        {'tcp', rabbit_types:protocol(), rabbit_net:socket(),
-         rabbit_channel:channel_number(), non_neg_integer(), pid(),
-         rabbit_types:user(), rabbit_types:vhost(), pid()} |
-        {'direct', rabbit_types:protocol(), rabbit_channel:channel_number(),
-         pid(), rabbit_types:user(), rabbit_types:vhost(), pid()}).
+        {'tcp', rabbit_net:socket(), rabbit_channel:channel_number(),
+         non_neg_integer(), pid(), rabbit_types:user(), rabbit_types:vhost(),
+         rabbit_types:protocol(), pid()} |
+        {'direct', rabbit_channel:channel_number(), pid(), rabbit_types:user(),
+         rabbit_types:vhost(), rabbit_types:protocol(), pid()}).
 
 -spec(start_link/1 :: (start_link_args()) -> {'ok', pid(), {pid(), any()}}).
 
@@ -43,7 +43,7 @@
 
 %%----------------------------------------------------------------------------
 
-start_link({tcp, Protocol, Sock, Channel, FrameMax, ReaderPid, User, VHost,
+start_link({tcp, Sock, Channel, FrameMax, ReaderPid, User, VHost, Protocol,
             Collector}) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, WriterPid} =
@@ -61,7 +61,7 @@ start_link({tcp, Protocol, Sock, Channel, FrameMax, ReaderPid, User, VHost,
            intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}),
     {ok, AState} = rabbit_command_assembler:init(Protocol),
     {ok, SupPid, {ChannelPid, AState}};
-start_link({direct, Protocol, Channel, ClientChannelPid, User, VHost,
+start_link({direct, Channel, ClientChannelPid, User, VHost, Protocol,
             Collector}) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, ChannelPid} =
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl
index 3b8c9fba39..8ee7aafc6f 100644
--- a/src/rabbit_direct.erl
+++ b/src/rabbit_direct.erl
@@ -16,7 +16,7 @@
 
 -module(rabbit_direct).
 
--export([boot/0, connect/3, start_channel/5]).
+-export([boot/0, connect/3, start_channel/6]).
 
 -include("rabbit.hrl").
 
@@ -28,9 +28,9 @@
 -spec(connect/3 :: (binary(), binary(), binary()) ->
                        {'ok', {rabbit_types:user(),
                                rabbit_framing:amqp_table()}}).
--spec(start_channel/5 :: (rabbit_channel:channel_number(), pid(),
-                          rabbit_types:user(), rabbit_types:vhost(), pid()) ->
-                             {'ok', pid()}).
+-spec(start_channel/6 :: (rabbit_channel:channel_number(), pid(),
+                          rabbit_types:user(), rabbit_types:vhost(),
+                          rabbit_types:protocol(), pid()) -> {'ok', pid()}).
 
 -endif.
 
@@ -67,9 +67,9 @@ connect(Username, Password, VHost) ->
             {error, broker_not_found_on_node}
     end.
 
-start_channel(Number, ClientChannelPid, User, VHost, Collector) ->
+start_channel(Number, ClientChannelPid, User, VHost, Protocol, Collector) ->
     {ok, _, {ChannelPid, _}} =
         supervisor2:start_child(
-            rabbit_direct_client_sup,
-            [{direct, Number, ClientChannelPid, User, VHost, Collector}]),
+            rabbit_direct_client_sup, [{direct, Number, ClientChannelPid, User,
+                                        VHost, Protocol, Collector}]),
     {ok, ChannelPid}.
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index a940310593..f54d52e546 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -852,8 +852,8 @@ send_to_new_channel(Channel, AnalyzedFrame, State) ->
                                  vhost     = VHost}} = State,
     {ok, _ChSupPid, {ChPid, AState}} =
         rabbit_channel_sup_sup:start_channel(
-          ChanSupSup, {tcp, Protocol, Sock, Channel, FrameMax, self(), User,
-                       VHost, Collector}),
+          ChanSupSup, {tcp, Sock, Channel, FrameMax, self(), User, VHost,
+                       Protocol, Collector}),
     MRef = erlang:monitor(process, ChPid),
     NewAState = process_channel_frame(AnalyzedFrame, self(),
                                       Channel, ChPid, AState),
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 45a117661e..f176dee9e2 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1020,8 +1020,9 @@ test_server_status() ->
     %% create a few things so there is some useful information to list
     Writer = spawn(fun () -> receive shutdown -> ok end end),
     {ok, Ch} = rabbit_channel:start_link(
-                 rabbit_framing_amqp_0_9_1, 1, self(), Writer, user(<<"user">>),
-                 <<"/">>, self(), fun (_) -> {ok, self()} end),
+                 1, self(), Writer, user(<<"user">>), <<"/">>,
+                 rabbit_framing_amqp_0_9_1, self(),
+                 fun (_) -> {ok, self()} end),
     [Q, Q2] = [Queue || Name <- [<<"foo">>, <<"bar">>],
                         {new, Queue = #amqqueue{}} <-
                             [rabbit_amqqueue:declare(
@@ -1080,8 +1081,9 @@ test_spawn(Receiver) ->
     Me = self(),
     Writer = spawn(fun () -> Receiver(Me) end),
     {ok, Ch} = rabbit_channel:start_link(
-                 rabbit_framing_amqp_0_9_1, 1, Me, Writer, user(<<"guest">>),
-                 <<"/">>, self(), fun (_) -> {ok, self()} end),
+                 1, Me, Writer, user(<<"guest">>), <<"/">>,
+                 rabbit_framing_amqp_0_9_1, self(),
+                 fun (_) -> {ok, self()} end),
     ok = rabbit_channel:do(Ch, #'channel.open'{}),
     receive #'channel.open_ok'{} -> ok
     after 1000 -> throw(failed_to_receive_channel_open_ok)