diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-02-21 13:44:59 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-02-21 13:44:59 +0000 |
| commit | 97dada17a2770d5af602755a38bd6fbb812b8934 (patch) | |
| tree | 8f562d881b598b74b9b55d71fbbd1ab6c7722489 /src/rabbit_connection_sup.erl | |
| parent | ecd7fb6e097f72060fcae8c49f5903fd8e569676 (diff) | |
| parent | d1562e9de47255303213793205f648c64aa542d1 (diff) | |
| download | rabbitmq-server-97dada17a2770d5af602755a38bd6fbb812b8934.tar.gz | |
Merged default into bug19375
Diffstat (limited to 'src/rabbit_connection_sup.erl')
| -rw-r--r-- | src/rabbit_connection_sup.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/rabbit_connection_sup.erl b/src/rabbit_connection_sup.erl index 12a532b6..31bc51b8 100644 --- a/src/rabbit_connection_sup.erl +++ b/src/rabbit_connection_sup.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2013 VMware, Inc. All rights reserved. %% -module(rabbit_connection_sup). @@ -42,16 +42,11 @@ start_link() -> SupPid, {collector, {rabbit_queue_collector, start_link, []}, intrinsic, ?MAX_WAIT, worker, [rabbit_queue_collector]}), - {ok, ChannelSupSupPid} = - supervisor2:start_child( - SupPid, - {channel_sup_sup, {rabbit_channel_sup_sup, start_link, []}, - intrinsic, infinity, supervisor, [rabbit_channel_sup_sup]}), {ok, ReaderPid} = supervisor2:start_child( SupPid, {reader, {rabbit_reader, start_link, - [ChannelSupSupPid, Collector, + [SupPid, Collector, rabbit_heartbeat:start_heartbeat_fun(SupPid)]}, intrinsic, ?MAX_WAIT, worker, [rabbit_reader]}), {ok, SupPid, ReaderPid}. |