Move capabilities to after the vhost consistently

5 files changed, 25 insertions, 25 deletions

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index d6396c99a0..a6790b6cd0 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -68,8 +68,8 @@
 -type(channel_number() :: non_neg_integer()).
 
 -spec(start_link/8 ::
-      (rabbit_framing:amqp_table(), channel_number(), pid(), pid(),
-       rabbit_types:user(), rabbit_types:vhost(), pid(),
+      (channel_number(), pid(), pid(), rabbit_types:user(),
+       rabbit_types:vhost(), rabbit_framing:amqp_table(), 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(Capabilities, Channel, ReaderPid, WriterPid, User, VHost,
+start_link(Channel, ReaderPid, WriterPid, User, VHost, Capabilities,
            CollectorPid, StartLimiterFun) ->
     gen_server2:start_link(?MODULE,
-                           [Capabilities, Channel, ReaderPid, WriterPid, User,
-                            VHost, CollectorPid, StartLimiterFun], []).
+                           [Channel, ReaderPid, WriterPid, User, VHost,
+                            Capabilities, CollectorPid, StartLimiterFun], []).
 
 do(Pid, Method) ->
     do(Pid, Method, none).
@@ -150,7 +150,7 @@ emit_stats(Pid) ->
 
 %%---------------------------------------------------------------------------
 
-init([Capabilities, Channel, ReaderPid, WriterPid, User, VHost, CollectorPid,
+init([Channel, ReaderPid, WriterPid, User, VHost, Capabilities, 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 6dc0eba497..9005819405 100644
--- a/src/rabbit_channel_sup.erl
+++ b/src/rabbit_channel_sup.erl
@@ -31,12 +31,12 @@
 -export_type([start_link_args/0]).
 
 -type(start_link_args() ::
-        {'tcp', rabbit_types:protocol(), rabbit_framing:amqp_table(),
-         rabbit_net:socket(), rabbit_channel:channel_number(),
-         non_neg_integer(), pid(), rabbit_types:user(), rabbit_types:vhost(),
+        {'tcp', rabbit_types:protocol(), rabbit_net:socket(),
+         rabbit_channel:channel_number(), non_neg_integer(), pid(),
+         rabbit_types:user(), rabbit_types:vhost(), rabbit_framing:amqp_table(),
          pid()} |
-        {'direct', rabbit_framing:amqp_table(), rabbit_channel:channel_number(),
-         pid(), rabbit_types:user(), rabbit_types:vhost(), pid()}).
+        {'direct', rabbit_channel:channel_number(), pid(), rabbit_types:user(),
+         rabbit_types:vhost(), rabbit_framing:amqp_table(), pid()}).
 
 -spec(start_link/1 :: (start_link_args()) -> {'ok', pid(), {pid(), any()}}).
 
@@ -44,8 +44,8 @@
 
 %%----------------------------------------------------------------------------
 
-start_link({tcp, Protocol, Capabilities, Sock, Channel, FrameMax, ReaderPid,
-            User, VHost, Collector}) ->
+start_link({tcp, Protocol, Sock, Channel, FrameMax, ReaderPid, User, VHost,
+            Capabilities, Collector}) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, WriterPid} =
         supervisor2:start_child(
@@ -57,20 +57,20 @@ start_link({tcp, Protocol, Capabilities, Sock, Channel, FrameMax, ReaderPid,
         supervisor2:start_child(
           SupPid,
           {channel, {rabbit_channel, start_link,
-                     [Capabilities, Channel, ReaderPid, WriterPid, User, VHost,
+                     [Channel, ReaderPid, WriterPid, User, VHost, Capabilities,
                       Collector, start_limiter_fun(SupPid)]},
            intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}),
     {ok, AState} = rabbit_command_assembler:init(Protocol),
     {ok, SupPid, {ChannelPid, AState}};
-start_link({direct, Capabilities, Channel, ClientChannelPid, User, VHost,
+start_link({direct, Channel, ClientChannelPid, User, VHost, Capabilities,
             Collector}) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, ChannelPid} =
         supervisor2:start_child(
             SupPid,
             {channel, {rabbit_channel, start_link,
-                       [Capabilities, Channel, ClientChannelPid,
-                        ClientChannelPid, User, VHost, Collector,
+                       [Channel, ClientChannelPid, ClientChannelPid, User,
+                        VHost, Capabilities, Collector,
                         start_limiter_fun(SupPid)]},
              intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}),
     {ok, SupPid, {ChannelPid, none}}.
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl
index 34f868cb3b..88d9baad30 100644
--- a/src/rabbit_direct.erl
+++ b/src/rabbit_direct.erl
@@ -68,10 +68,10 @@ connect(Username, Password, VHost) ->
             {error, broker_not_found_on_node}
     end.
 
-start_channel(Capabilities, Number, ClientChannelPid, User, VHost, Collector) ->
+start_channel(Number, ClientChannelPid, User, VHost, Capabilities, Collector) ->
     {ok, _, {ChannelPid, _}} =
         supervisor2:start_child(
             rabbit_direct_client_sup,
-            [{direct, Capabilities, Number, ClientChannelPid, User, VHost,
+            [{direct, Number, ClientChannelPid, User, VHost, Capabilities,
               Collector}]),
     {ok, ChannelPid}.
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 7753bb50a8..c43b63c18f 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -960,8 +960,8 @@ send_to_new_channel(Channel, AnalyzedFrame, State) ->
                                  capabilities = Capabilities}} = State,
     {ok, _ChSupPid, {ChPid, AState}} =
         rabbit_channel_sup_sup:start_channel(
-          ChanSupSup, {tcp, Protocol, Capabilities, Sock, Channel, FrameMax,
-                       self(), User, VHost, Collector}),
+          ChanSupSup, {tcp, Protocol, Sock, Channel, FrameMax, self(), User,
+                       VHost, Capabilities, Collector}),
     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 d6c85af119..e28400eb47 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1019,8 +1019,8 @@ test_user_management() ->
 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([], 1, self(), Writer,
-                                         user(<<"user">>), <<"/">>, self(),
+    {ok, Ch} = rabbit_channel:start_link(1, self(), Writer,
+                                         user(<<"user">>), <<"/">>, [], self(),
                                          fun (_) -> {ok, self()} end),
     [Q, Q2] = [Queue || Name <- [<<"foo">>, <<"bar">>],
                         {new, Queue = #amqqueue{}} <-
@@ -1079,8 +1079,8 @@ test_server_status() ->
 test_spawn(Receiver) ->
     Me = self(),
     Writer = spawn(fun () -> Receiver(Me) end),
-    {ok, Ch} = rabbit_channel:start_link([], 1, Me, Writer,
-                                         user(<<"guest">>), <<"/">>, self(),
+    {ok, Ch} = rabbit_channel:start_link(1, Me, Writer, user(<<"guest">>),
+                                         <<"/">>, [], self(),
                                          fun (_) -> {ok, self()} end),
     ok = rabbit_channel:do(Ch, #'channel.open'{}),
     receive #'channel.open_ok'{} -> ok