diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-08-19 14:55:42 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-08-19 14:55:42 +0100 |
| commit | 640fc3b30d9044e94b8466f233b58fe9dd5876cd (patch) | |
| tree | bd6b03456c7a4d1009acd2ac7d93041ab97cb1f9 /src/rabbit_amqqueue.erl | |
| parent | f0ee2e3a51f3635c69b0058283cb58d1ef35530a (diff) | |
| download | rabbitmq-server-640fc3b30d9044e94b8466f233b58fe9dd5876cd.tar.gz | |
Roll slave startup into the new mechanism.
Diffstat (limited to 'src/rabbit_amqqueue.erl')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index b93b6be6..e25e0f97 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -246,7 +246,7 @@ find_durable_queues() -> recover_durable_queues(QueuesAndRecoveryTerms) -> {Results, Failures} = - gen_server2:mcall([{start_queue_process(node(), Q), + gen_server2:mcall([{rabbit_amqqueue_sup:start_queue_process(node(), Q), {init, {self(), Terms}}} || {Q, Terms} <- QueuesAndRecoveryTerms]), [rabbit_log:error("Queue ~p failed to initialise: ~p~n", @@ -274,7 +274,8 @@ declare(QueueName, Durable, AutoDelete, Args, Owner, Node) -> down_slave_nodes = [], gm_pids = []})), Node = rabbit_mirror_queue_misc:initial_queue_node(Q, Node), - gen_server2:call(start_queue_process(Node, Q), {init, new}, infinity). + gen_server2:call( + rabbit_amqqueue_sup:start_queue_process(Node, Q), {init, new}, infinity). internal_declare(Q = #amqqueue{name = QueueName}) -> case not_found_or_absent(QueueName) of @@ -331,10 +332,6 @@ policy_changed(Q1 = #amqqueue{decorators = Decorators1}, %% mirroring-related has changed - the policy may have changed anyway. notify_policy_changed(Q1). -start_queue_process(Node, Q) -> - {ok, Pid} = rabbit_amqqueue_sup:start_child(Node, [Q]), - Pid. - add_default_binding(#amqqueue{name = QueueName}) -> ExchangeName = rabbit_misc:r(QueueName, exchange, <<>>), RoutingKey = QueueName#resource.name, |