diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-16 16:42:34 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-02-16 16:42:34 +0000 |
| commit | 2c2ca592a2dd6b03b3446c88159b0b61aaa503cc (patch) | |
| tree | c00df806448e8896972f89ca30ccfe5802824bf1 /src/rabbit_direct.erl | |
| parent | 70635096f80d30cb2fff1425a17d4bf1aea9ca0b (diff) | |
| parent | 63ea1a002366c40646f870602d1efefdd0f2665a (diff) | |
| download | rabbitmq-server-2c2ca592a2dd6b03b3446c88159b0b61aaa503cc.tar.gz | |
Merging default to bug23839
Diffstat (limited to 'src/rabbit_direct.erl')
| -rw-r--r-- | src/rabbit_direct.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index bd41a8b9..2cc0c1da 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -16,7 +16,7 @@ -module(rabbit_direct). --export([boot/0, connect/4, start_channel/5]). +-export([boot/0, connect/4, start_channel/6]). -include("rabbit.hrl"). @@ -28,9 +28,10 @@ -spec(connect/4 :: (binary(), binary(), binary(), rabbit_types:protocol()) -> {'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_framing:amqp_table(), rabbit_channel:channel_number(), pid(), + rabbit_types:user(), rabbit_types:vhost(), pid()) -> + {'ok', pid()}). -endif. @@ -68,9 +69,10 @@ connect(Username, Password, VHost, Protocol) -> {error, broker_not_found_on_node} end. -start_channel(Number, ClientChannelPid, User, VHost, Collector) -> +start_channel(Number, ClientChannelPid, User, VHost, Capabilities, Collector) -> {ok, _, {ChannelPid, _}} = supervisor2:start_child( rabbit_direct_client_sup, - [{direct, Number, ClientChannelPid, User, VHost, Collector}]), + [{direct, Number, ClientChannelPid, User, VHost, Capabilities, + Collector}]), {ok, ChannelPid}. |