diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-15 11:54:01 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-15 11:54:01 +0000 |
| commit | 63ea1a002366c40646f870602d1efefdd0f2665a (patch) | |
| tree | fbce21edf293f23617634db345e685b707025df3 /src/rabbit_channel_sup.erl | |
| parent | 88651d6fc3d3f6bfcd9a94bceec465d9a5271865 (diff) | |
| download | rabbitmq-server-63ea1a002366c40646f870602d1efefdd0f2665a.tar.gz | |
Move capabilities to after the vhost consistently
Diffstat (limited to 'src/rabbit_channel_sup.erl')
| -rw-r--r-- | src/rabbit_channel_sup.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl index 6dc0eba4..90058194 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}}. |