diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-03-16 12:58:11 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-03-16 12:58:11 +0000 |
| commit | a6586a1c333ce2499a787c07ec7cb2c8a2cfc180 (patch) | |
| tree | b6b6c01a37769196317c649c4dd855c1b979bff2 /src/rabbit_direct.erl | |
| parent | d38fe2887d29b677a15eb6bdad2ea55ce76c5405 (diff) | |
| download | rabbitmq-server-a6586a1c333ce2499a787c07ec7cb2c8a2cfc180.tar.gz | |
Transplant reader_pid vs connection_pid work from bug23350.
Diffstat (limited to 'src/rabbit_direct.erl')
| -rw-r--r-- | src/rabbit_direct.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index a2693c69..568cbea3 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/7]). +-export([boot/0, connect/4, start_channel/8]). -include("rabbit.hrl"). @@ -28,8 +28,8 @@ -spec(connect/4 :: (binary(), binary(), binary(), rabbit_types:protocol()) -> {'ok', {rabbit_types:user(), rabbit_framing:amqp_table()}}). --spec(start_channel/7 :: - (rabbit_channel:channel_number(), pid(), rabbit_types:protocol(), +-spec(start_channel/8 :: + (rabbit_channel:channel_number(), pid(), pid(), rabbit_types:protocol(), rabbit_types:user(), rabbit_types:vhost(), rabbit_framing:amqp_table(), pid()) -> {'ok', pid()}). @@ -69,11 +69,11 @@ connect(Username, Password, VHost, Protocol) -> {error, broker_not_found_on_node} end. -start_channel(Number, ClientChannelPid, Protocol, User, VHost, Capabilities, - Collector) -> +start_channel(Number, ClientChannelPid, ConnectionPid, Protocol, User, VHost, + Capabilities, Collector) -> {ok, _, {ChannelPid, _}} = supervisor2:start_child( rabbit_direct_client_sup, - [{direct, Number, ClientChannelPid, Protocol, User, VHost, - Capabilities, Collector}]), + [{direct, Number, ClientChannelPid, ConnectionPid, Protocol, User, + VHost, Capabilities, Collector}]), {ok, ChannelPid}. |